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 | |
| 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.
| -rw-r--r-- | phpBB/install/database_update.php | 24 | ||||
| -rw-r--r-- | phpBB/install/index.php | 24 | ||||
| -rw-r--r-- | phpBB/viewforum.php | 2 |
3 files changed, 39 insertions, 11 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e9213cac9d..337f08b626 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -34,7 +34,24 @@ define('IN_INSTALL', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -require($phpbb_root_path . 'includes/startup.' . $phpEx); +function phpbb_require_updated($path, $optional = false) +{ + global $phpbb_root_path; + + $new_path = $phpbb_root_path . 'install/update/new/' . $path; + $old_path = $phpbb_root_path . $path; + + if (file_exists($new_path)) + { + require($new_path); + } + else if (!$optional || file_exists($old_path)) + { + require($old_path); + } +} + +phpbb_require_updated('includes/startup.' . $phpEx); $updates_to_version = UPDATES_TO_VERSION; $debug_from_version = DEBUG_FROM_VERSION; @@ -72,10 +89,7 @@ require($phpbb_root_path . 'includes/auth.' . $phpEx); require($phpbb_root_path . 'includes/functions.' . $phpEx); -if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/functions_content.' . $phpEx); -} +phpbb_require_updated('includes/functions_content.' . $phpEx, true); require($phpbb_root_path . 'includes/functions_admin.' . $phpEx); require($phpbb_root_path . 'includes/constants.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index ff6a297022..5189cbfc8e 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -24,7 +24,24 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0) die('You are running an unsupported PHP version. Please upgrade to PHP 4.3.3 or higher before trying to install phpBB 3.0'); } -require($phpbb_root_path . 'includes/startup.' . $phpEx); +function phpbb_require_updated($path, $optional = false) +{ + global $phpbb_root_path; + + $new_path = $phpbb_root_path . 'install/update/new/' . $path; + $old_path = $phpbb_root_path . $path; + + if (file_exists($new_path)) + { + require($new_path); + } + else if (!$optional || file_exists($old_path)) + { + require($old_path); + } +} + +phpbb_require_updated('includes/startup.' . $phpEx); // Try to override some limits - maybe it helps some... @set_time_limit(0); @@ -57,10 +74,7 @@ else // Include essential scripts require($phpbb_root_path . 'includes/functions.' . $phpEx); -if (file_exists($phpbb_root_path . 'includes/functions_content.' . $phpEx)) -{ - require($phpbb_root_path . 'includes/functions_content.' . $phpEx); -} +phpbb_require_updated('includes/functions_content.' . $phpEx, true); include($phpbb_root_path . 'includes/auth.' . $phpEx); include($phpbb_root_path . 'includes/session.' . $phpEx); 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; |