diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:57:42 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:57:42 +0200 |
| commit | 93dba4b02398a2bafec13348117b370859951fb6 (patch) | |
| tree | b40a0e1d0a1ae542b182c42876735f0b7fb3c3a0 /phpBB/viewforum.php | |
| parent | 540545c4bd57cd61dd84acf33fb2403b496b7965 (diff) | |
| parent | 4e85731a5f7bd336f23b463b69b7cc8953225046 (diff) | |
| download | forums-93dba4b02398a2bafec13348117b370859951fb6.tar forums-93dba4b02398a2bafec13348117b370859951fb6.tar.gz forums-93dba4b02398a2bafec13348117b370859951fb6.tar.bz2 forums-93dba4b02398a2bafec13348117b370859951fb6.tar.xz forums-93dba4b02398a2bafec13348117b370859951fb6.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10223] The search fid parameter is an array of forums not just an id
[ticket/10223] Check optional before file_exists and correct require path
[ticket/10223] requiring the new startup.php file conditionally.
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 7b957482e8..e0cce526db 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -272,7 +272,7 @@ $post_alt = ($forum_data['forum_status'] == ITEM_LOCKED) ? $user->lang['FORUM_LO // Display active topics? $s_display_active = ($forum_data['forum_type'] == FORUM_CAT && ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS)) ? true : false; -$s_search_hidden_fields = array('fid' => $forum_id); +$s_search_hidden_fields = array('fid' => array($forum_id)); if ($_SID) { $s_search_hidden_fields['sid'] = $_SID; |