diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-20 00:28:02 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-20 00:28:02 +0200 |
| commit | d5c2bbf62070224fe040d75684574fb10409ac53 (patch) | |
| tree | be4ecb9acc2ce8c84099b41c89f5b9728ed66696 | |
| parent | 6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff (diff) | |
| parent | ad5ed9d0ee987da29a6d49c42cc3118d4868e539 (diff) | |
| download | forums-d5c2bbf62070224fe040d75684574fb10409ac53.tar forums-d5c2bbf62070224fe040d75684574fb10409ac53.tar.gz forums-d5c2bbf62070224fe040d75684574fb10409ac53.tar.bz2 forums-d5c2bbf62070224fe040d75684574fb10409ac53.tar.xz forums-d5c2bbf62070224fe040d75684574fb10409ac53.zip | |
Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
[ticket/10223] Make definition of phpbb_require_updated conditional
| -rw-r--r-- | phpBB/install/database_update.php | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e0901eedb1..edfc3b1027 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -34,20 +34,23 @@ define('IN_INSTALL', true); $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpEx = substr(strrchr(__FILE__, '.'), 1); -function phpbb_require_updated($path, $optional = false) +if (!function_exists('phpbb_require_updated')) { - global $phpbb_root_path; + function phpbb_require_updated($path, $optional = false) + { + global $phpbb_root_path; - $new_path = $phpbb_root_path . 'install/update/new/' . $path; - $old_path = $phpbb_root_path . $path; + $new_path = $phpbb_root_path . 'install/update/new/' . $path; + $old_path = $phpbb_root_path . $path; - if (file_exists($new_path)) - { - require($new_path); - } - else if (!$optional || file_exists($old_path)) - { - require($old_path); + if (file_exists($new_path)) + { + require($new_path); + } + else if (!$optional || file_exists($old_path)) + { + require($old_path); + } } } |