diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-19 01:19:31 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-19 01:19:31 +0200 |
| commit | de729110c8d723b64da333f515ba0acf2723c88c (patch) | |
| tree | 11d02476f5b5c164c1c29c48d14f8658b1a433c4 /phpBB/phpbb/install | |
| parent | 2f8ef80d92457e29f688155cd5433a92fa981139 (diff) | |
| download | forums-de729110c8d723b64da333f515ba0acf2723c88c.tar forums-de729110c8d723b64da333f515ba0acf2723c88c.tar.gz forums-de729110c8d723b64da333f515ba0acf2723c88c.tar.bz2 forums-de729110c8d723b64da333f515ba0acf2723c88c.tar.xz forums-de729110c8d723b64da333f515ba0acf2723c88c.zip | |
[ticket/14039] Fix inclusion logic in update helper
PHPBB3-14039
Diffstat (limited to 'phpBB/phpbb/install')
| -rw-r--r-- | phpBB/phpbb/install/helper/update_helper.php | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/phpBB/phpbb/install/helper/update_helper.php b/phpBB/phpbb/install/helper/update_helper.php index 2a3e6ceb0a..a00731d317 100644 --- a/phpBB/phpbb/install/helper/update_helper.php +++ b/phpBB/phpbb/install/helper/update_helper.php @@ -72,16 +72,11 @@ class update_helper */ public function include_file($filename) { - if (!is_file($this->phpbb_root_path . $filename)) - { - return; - } - if (is_file($this->path_to_new_files . $filename)) { include_once($this->path_to_new_files . $filename); } - else + else if (is_file($this->phpbb_root_path . $filename)) { include_once($this->phpbb_root_path . $filename); } |