2 files changed, 38 insertions, 10 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index e9213cac9d..0d424d0d88 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 (file_exists($old_path) || !$optional)
+    {
+        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($phpbb_root_path . '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..c82c3dbc13 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 (file_exists($old_path) || !$optional)
+    {
+        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($phpbb_root_path . 'includes/functions_content.' . $phpEx, true);
 
 include($phpbb_root_path . 'includes/auth.' . $phpEx);
 include($phpbb_root_path . 'includes/session.' . $phpEx);