diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:56:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 17:56:30 +0200 |
| commit | c4c22d4421950a12986baeacab8bc150fbae3b9d (patch) | |
| tree | e0f5c2df3ed072576096e5668b1d9ba0a34c2766 /phpBB/viewforum.php | |
| parent | 882cb084d70cc428dcba9b07c45666a4a6615635 (diff) | |
| parent | d37e8dd6d38bc288ae9179389ac845cab1f61386 (diff) | |
| download | forums-c4c22d4421950a12986baeacab8bc150fbae3b9d.tar forums-c4c22d4421950a12986baeacab8bc150fbae3b9d.tar.gz forums-c4c22d4421950a12986baeacab8bc150fbae3b9d.tar.bz2 forums-c4c22d4421950a12986baeacab8bc150fbae3b9d.tar.xz forums-c4c22d4421950a12986baeacab8bc150fbae3b9d.zip | |
Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
[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; |