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 | |
| 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.
| -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 b4166186d3..e2f5b76fed 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -33,7 +33,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; @@ -70,10 +87,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 3d8c0afa70..648f037533 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); @@ -58,10 +75,7 @@ else require($phpbb_root_path . 'includes/class_loader.' . $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); 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 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; |