diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:30:09 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-18 11:30:09 +0200 |
| commit | 6b561b9eae320b06178725fdccbc3e67c0990837 (patch) | |
| tree | d497ba71e2c8598cfd798486ba12e6766cd61b62 | |
| parent | 100bb8f27c52b2faffddf2a6926c5d7b49faa421 (diff) | |
| download | forums-6b561b9eae320b06178725fdccbc3e67c0990837.tar forums-6b561b9eae320b06178725fdccbc3e67c0990837.tar.gz forums-6b561b9eae320b06178725fdccbc3e67c0990837.tar.bz2 forums-6b561b9eae320b06178725fdccbc3e67c0990837.tar.xz forums-6b561b9eae320b06178725fdccbc3e67c0990837.zip | |
[ticket/14039] Use compatibility globals from the update package
PHPBB3-14039
| -rw-r--r-- | phpBB/phpbb/install/helper/container_factory.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/helper/container_factory.php b/phpBB/phpbb/install/helper/container_factory.php index fd42d53c00..8c007de39f 100644 --- a/phpBB/phpbb/install/helper/container_factory.php +++ b/phpBB/phpbb/install/helper/container_factory.php @@ -168,6 +168,13 @@ class container_factory } // Get compatibilty globals - require ($this->phpbb_root_path . 'includes/compatibility_globals.' . $this->php_ext); + if (file_exists($this->phpbb_root_path . 'install/update/new/includes/compatibility_globals.' . $this->php_ext)) + { + require($this->phpbb_root_path . 'install/update/new/includes/compatibility_globals.' . $this->php_ext); + } + else + { + require($this->phpbb_root_path . 'includes/compatibility_globals.' . $this->php_ext); + } } } |