diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-20 00:28:42 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-20 00:28:42 +0200 |
| commit | cc7c5d54ad62e06254fa20eef29ae15c540a6668 (patch) | |
| tree | 6b8a530be410c326a07d6885d6e75a126cdb2ac7 /phpBB/install/database_update.php | |
| parent | fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b (diff) | |
| parent | e0ecd3e11835ae053e9cb8a10f25c28f881f74e9 (diff) | |
| download | forums-cc7c5d54ad62e06254fa20eef29ae15c540a6668.tar forums-cc7c5d54ad62e06254fa20eef29ae15c540a6668.tar.gz forums-cc7c5d54ad62e06254fa20eef29ae15c540a6668.tar.bz2 forums-cc7c5d54ad62e06254fa20eef29ae15c540a6668.tar.xz forums-cc7c5d54ad62e06254fa20eef29ae15c540a6668.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10223] Make definition of phpbb_require_updated conditional
Diffstat (limited to 'phpBB/install/database_update.php')
| -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 b368de80fc..21defd0a80 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -33,20 +33,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); + } } } |