From c96f8936c969b3fd441c179cc4ffa8ea75d8f901 Mon Sep 17 00:00:00 2001
From: Igor Wiedler <igor@wiedler.ch>
Date: Sat, 13 Jul 2013 18:19:21 -0400
Subject: [PATCH] [ticket/11574] Fix table prefix in database updater

PHPBB3-11574
---
 phpBB/install/database_update.php | 3 ++-
 phpBB/install/index.php           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 51ffdd3c88..5f2d46c7ad 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -25,7 +25,7 @@ if (!function_exists('phpbb_require_updated'))
 {
 	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 @@ phpbb_require_updated('includes/functions.' . $phpEx);
 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
index 4051a5a08b..055fb72d7c 100644
--- a/phpBB/install/index.php
+++ b/phpBB/install/index.php
@@ -28,7 +28,7 @@ if (version_compare(PHP_VERSION, '5.3.3') < 0)
 
 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;