[ticket/11574] Fix table prefix in database updater

PHPBB3-11574
D-MBLD · Jul 14, 2013 · c96f893 · c96f893
1 parent d6de892
commit c96f893
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
@@ -25,7 +25,7 @@
 {
 	function phpbb_require_updated($path, $optional = false)
 	{
-		global $phpbb_root_path;
+		global $phpbb_root_path, $table_prefix;
 
 		$new_path = $phpbb_root_path . 'install/update/new/' . $path;
 		$old_path = $phpbb_root_path . $path;
@@ -108,6 +108,7 @@ function phpbb_end_update($cache, $config)
 phpbb_require_updated('includes/functions_content.' . $phpEx);
 phpbb_require_updated('includes/functions_container.' . $phpEx);
 
+require($phpbb_root_path . 'config.' . $phpEx);
 phpbb_require_updated('includes/constants.' . $phpEx);
 phpbb_require_updated('includes/utf/utf_tools.' . $phpEx);
 

diff --git a/phpBB/install/index.php b/phpBB/install/index.php
@@ -28,7 +28,7 @@
 
 function phpbb_require_updated($path, $optional = false)
 {
-	global $phpbb_root_path;
+	global $phpbb_root_path, $table_prefix;
 
 	$new_path = $phpbb_root_path . 'install/update/new/' . $path;
 	$old_path = $phpbb_root_path . $path;