diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:57:29 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:57:29 +0200 |
| commit | 4e85731a5f7bd336f23b463b69b7cc8953225046 (patch) | |
| tree | ddb6f3a0886d179d378cf9f6d5bf412ccdbcdaeb /phpBB/viewforum.php | |
| parent | 4ac9bde2d121276a12b784ab7c56b7f5a4b6c77e (diff) | |
| parent | c4c22d4421950a12986baeacab8bc150fbae3b9d (diff) | |
| download | forums-4e85731a5f7bd336f23b463b69b7cc8953225046.tar forums-4e85731a5f7bd336f23b463b69b7cc8953225046.tar.gz forums-4e85731a5f7bd336f23b463b69b7cc8953225046.tar.bz2 forums-4e85731a5f7bd336f23b463b69b7cc8953225046.tar.xz forums-4e85731a5f7bd336f23b463b69b7cc8953225046.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[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 fff5be69d3..cfdc90c947 100644 --- a/phpBB/viewforum.php +++ b/phpBB/viewforum.php @@ -267,7 +267,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; |