aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-19 17:58:16 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-19 17:58:16 +0200
commitb2f5d5c876aa2115c6f5e8e7ad0630352d65ddda (patch)
tree09e682179ebf9e35b17aa8960bc5fa21588a0fd5 /phpBB/viewforum.php
parent93dba4b02398a2bafec13348117b370859951fb6 (diff)
parentb43907d69ecb8c63d85c973520209f1050ad8165 (diff)
downloadforums-b2f5d5c876aa2115c6f5e8e7ad0630352d65ddda.tar
forums-b2f5d5c876aa2115c6f5e8e7ad0630352d65ddda.tar.gz
forums-b2f5d5c876aa2115c6f5e8e7ad0630352d65ddda.tar.bz2
forums-b2f5d5c876aa2115c6f5e8e7ad0630352d65ddda.tar.xz
forums-b2f5d5c876aa2115c6f5e8e7ad0630352d65ddda.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10232] Renamed S_SEARCH_HIDDEN_FIELDS to S_SEARCH_LOCAL_HIDDEN_FIELDS
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index e0cce526db..929e6fcaa2 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -316,7 +316,7 @@ $template->assign_vars(array(
'S_FORUM_ACTION' => append_sid("{$phpbb_root_path}viewforum.$phpEx", "f=$forum_id" . (($start == 0) ? '' : "&amp;start=$start")),
'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"),
- 'S_SEARCH_HIDDEN_FIELDS' => build_hidden_fields($s_search_hidden_fields),
+ 'S_SEARCH_LOCAL_HIDDEN_FIELDS' => build_hidden_fields($s_search_hidden_fields),
'S_SINGLE_MODERATOR' => (!empty($moderators[$forum_id]) && sizeof($moderators[$forum_id]) > 1) ? false : true,
'S_IS_LOCKED' => ($forum_data['forum_status'] == ITEM_LOCKED) ? true : false,
'S_VIEWFORUM' => true,