mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-19 23:11:45 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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.
This commit is contained in:
Andreas Fischer
2011-06-19 17:57:42 +02:00
parent 540545c4bd 4e85731a5f
commit 93dba4b023
3 changed files with 39 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/viewforum.php
View File

@@ -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;