diff options
| author |   Nils Adermann <naderman@naderman.de> | 2007-08-18 13:52:33 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-08-18 13:52:33 +0000 |
| commit | 979ee667735b091db9158d05fde8b0d337cc902b (patch) | |
| tree | 8d1ab978a34aa30e601b4203164ea4038641ddb2 /phpBB/search.php | |
| parent | - strip_bbcode should not treat smilies which look like BBCode and are placed... (diff) | |
| download | phpbb-979ee667735b091db9158d05fde8b0d337cc902b.tar.gz phpbb-979ee667735b091db9158d05fde8b0d337cc902b.tar.bz2 phpbb-979ee667735b091db9158d05fde8b0d337cc902b.zip | |
- allow multibyte search configuration
- added ldap_user_filter to add additional restrictions on the user objects used for authentication [Bug #12627]
- improved ldap explanations a bit
- display searchable subforums of invisible parents in advanced search forum selection [Bug #11395]
git-svn-id: file:///svn/phpbb/trunk@8047 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 9a50ce2fcb..d9010b73a8 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -939,9 +939,9 @@ while ($row = $db->sql_fetchrow($result)) continue; } - if (!$auth->acl_get('f_list', $row['forum_id']) || $row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id'])) + if ($row['forum_type'] == FORUM_LINK || ($row['forum_password'] && !$row['user_id'])) { - // if the user does not have permissions to list this forum skip to the next branch + // if this forum is a link or password protected (user has not entered the password yet) then skip to the next branch continue; } @@ -964,9 +964,9 @@ while ($row = $db->sql_fetchrow($result)) $right = $row['right_id']; - if (!$auth->acl_get('f_search', $row['forum_id'])) + if ($auth->acl_gets('!f_search', '!f_list', $row['forum_id'])) { - // if the user does not have permissions to search this forum skip only this forum/category + // if the user does not have permissions to search or see this forum skip only this forum/category continue; } |