diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-04-15 21:40:25 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-04-15 21:40:25 +0000 |
| commit | c76a2cdfe867952c3b1087a585589debc0b5d648 (patch) | |
| tree | c6fab56488507014529675db2a0b361f64273f36 /phpBB/viewforum.php | |
| parent | 6e92276b87ee57b45598cb559ebce7db999ce3ac (diff) | |
| download | forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.gz forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.bz2 forums-c76a2cdfe867952c3b1087a585589debc0b5d648.tar.xz forums-c76a2cdfe867952c3b1087a585589debc0b5d648.zip | |
- viewtopic/forum search boxes should also use search config option and u_search permission [Bug #9850]
- mcp_reports was still using some of the mcp_queue post_id logic, changed enough to report_id logic to make it work properly now. I hope I didn't miss any external places referring to mcp_reports which send it a post_id_list. I really wonder whether people don't test the MCP at all? Good that I noticed this myself when fixing an incorrect language string (No reports selected) message [Bug #9741]
- forgot to check in the changed mcp/info file for mcp_warn with global m_warn option
- mcp_post.html was missing a submit button for changing the poster in prosilver [Bug #9771]
- language variables in javascript in templates should use LA_ not L_ for proper escaping of single quotes
git-svn-id: file:///svn/phpbb/trunk@7361 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
| -rw-r--r-- | phpBB/viewforum.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php index 1244aff9a4..15b6eac31b 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -276,7 +276,7 @@ $template->assign_vars(array( 'S_WATCH_FORUM_LINK' => $s_watching_forum['link'], 'S_WATCH_FORUM_TITLE' => $s_watching_forum['title'], 'S_FORUM_ACTION' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id&start=$start"), - 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('f_search', $forum_id)) ? true : false, + 'S_DISPLAY_SEARCHBOX' => ($auth->acl_get('u_search') && $auth->acl_get('f_search', $forum_id) && $config['load_search']) ? true : false, 'S_SEARCHBOX_ACTION' => append_sid("{$phpbb_root_path}search.$phpEx", 'fid[]=' . $forum_id), 'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true, |