aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-30 21:46:33 +0200
committerTristan Darricau <github@nicofuma.fr>2014-07-07 01:02:47 +0200
commit285656a6d4b708c2ff40b85c591ef361114ca717 (patch)
tree4772290b6cc85f430fa3bb9f1774deab8006172e
parent6c57fbecac3aff2341fc874a911b3f296252ee3e (diff)
downloadforums-285656a6d4b708c2ff40b85c591ef361114ca717.tar
forums-285656a6d4b708c2ff40b85c591ef361114ca717.tar.gz
forums-285656a6d4b708c2ff40b85c591ef361114ca717.tar.bz2
forums-285656a6d4b708c2ff40b85c591ef361114ca717.tar.xz
forums-285656a6d4b708c2ff40b85c591ef361114ca717.zip
[ticket/12775] Extract the vars later in install/install_update.php
PHPBB3-12775
-rw-r--r--phpBB/install/install_update.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php
index ac89214590..28777a8d24 100644
--- a/phpBB/install/install_update.php
+++ b/phpBB/install/install_update.php
@@ -68,8 +68,6 @@ class install_update extends module
global $template, $phpEx, $phpbb_root_path, $user, $db, $config, $cache, $auth, $language;
global $request, $phpbb_admin_path, $phpbb_adm_relative_path, $phpbb_container, $phpbb_config_php_file;
- extract($phpbb_config_php_file->get_all());
-
// We must enable super globals, otherwise creating a new instance of the request class,
// using the new container with a dbal connection will fail with the following PHP Notice:
// Object of class phpbb_request_deactivated_super_global could not be converted to int
@@ -95,6 +93,7 @@ class install_update extends module
$this->new_location = $phpbb_root_path . 'install/update/new/';
// Init DB
+ extract($phpbb_config_php_file->get_all());
require($phpbb_root_path . 'includes/constants.' . $phpEx);
// Special options for conflicts/modified files