diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 19:18:53 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 19:18:53 +0200 |
| commit | 56093d1c82d6f4d5c0f2741769eb071eb7bec5d7 (patch) | |
| tree | 908573123893f63b771b9947da388d27b780260a /phpBB | |
| parent | d4dd112edf07eb45d4e73d78c47b48a94700e6c3 (diff) | |
| download | forums-56093d1c82d6f4d5c0f2741769eb071eb7bec5d7.tar forums-56093d1c82d6f4d5c0f2741769eb071eb7bec5d7.tar.gz forums-56093d1c82d6f4d5c0f2741769eb071eb7bec5d7.tar.bz2 forums-56093d1c82d6f4d5c0f2741769eb071eb7bec5d7.tar.xz forums-56093d1c82d6f4d5c0f2741769eb071eb7bec5d7.zip | |
[ticket/14039] Fix constants for the updater
PHPBB3-14039
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install_new/startup.php | 1 | ||||
| -rw-r--r-- | phpBB/phpbb/install/helper/container_factory.php | 13 |
2 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/install_new/startup.php b/phpBB/install_new/startup.php index 4d558d015f..766f6be38a 100644 --- a/phpBB/install_new/startup.php +++ b/phpBB/install_new/startup.php @@ -62,7 +62,6 @@ $phpbb_adm_relative_path = (isset($phpbb_adm_relative_path)) ? $phpbb_adm_relati $phpbb_admin_path = (defined('PHPBB_ADMIN_PATH')) ? PHPBB_ADMIN_PATH : $phpbb_root_path . $phpbb_adm_relative_path; // Include files -phpbb_require_updated('includes/constants.' . $phpEx, $phpbb_root_path); phpbb_require_updated('includes/functions.' . $phpEx, $phpbb_root_path); phpbb_require_updated('includes/functions_content.' . $phpEx, $phpbb_root_path); phpbb_include_updated('includes/functions_compatibility.' . $phpEx, $phpbb_root_path); diff --git a/phpBB/phpbb/install/helper/container_factory.php b/phpBB/phpbb/install/helper/container_factory.php index efbe278628..bf19efe22e 100644 --- a/phpBB/phpbb/install/helper/container_factory.php +++ b/phpBB/phpbb/install/helper/container_factory.php @@ -133,7 +133,7 @@ class container_factory $phpbb_container_builder = new \phpbb\di\container_builder($this->phpbb_root_path, $this->php_ext); // For BC with functions that we need during install - global $phpbb_container; + global $phpbb_container, $table_prefix; $disable_super_globals = $this->request->super_globals_disabled(); @@ -172,6 +172,7 @@ class container_factory $this->container->compile(); $phpbb_container = $this->container; + $table_prefix = $phpbb_config_php_file->get('table_prefix'); // Restore super globals to previous state if ($disable_super_globals) @@ -188,5 +189,15 @@ class container_factory { require($this->phpbb_root_path . 'includes/compatibility_globals.' . $this->php_ext); } + + // Get compatibilty globals + if (file_exists($this->phpbb_root_path . 'install/update/new/includes/constants.' . $this->php_ext)) + { + require($this->phpbb_root_path . 'install/update/new/includes/constants.' . $this->php_ext); + } + else + { + require($this->phpbb_root_path . 'includes/constants.' . $this->php_ext); + } } } |