diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 23:11:57 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 23:11:57 +0200 |
| commit | 6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff (patch) | |
| tree | 87e4a21d57514b6de241dc7650c26e08f955f215 | |
| parent | e2fe25fbdceb4a4d83e5e33184076fd010b2fbe3 (diff) | |
| parent | 67fde80fbbfc219352ad19124446bb63451306eb (diff) | |
| download | forums-6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff.tar forums-6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff.tar.gz forums-6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff.tar.bz2 forums-6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff.tar.xz forums-6a4ca8cad9bc6602ec3a5b0041cf619fc8aebaff.zip | |
Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9
* naderman/ticket/10223:
[ticket/10223] Replace spaces with tabs
| -rw-r--r-- | phpBB/install/database_update.php | 26 | ||||
| -rw-r--r-- | phpBB/install/index.php | 26 |
2 files changed, 26 insertions, 26 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 337f08b626..e0901eedb1 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -36,19 +36,19 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1); 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; - - if (file_exists($new_path)) - { - require($new_path); - } - else if (!$optional || file_exists($old_path)) - { - require($old_path); - } + global $phpbb_root_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); + } } phpbb_require_updated('includes/startup.' . $phpEx); diff --git a/phpBB/install/index.php b/phpBB/install/index.php index 5189cbfc8e..f534980389 100644 --- a/phpBB/install/index.php +++ b/phpBB/install/index.php @@ -26,19 +26,19 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0) 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; - - if (file_exists($new_path)) - { - require($new_path); - } - else if (!$optional || file_exists($old_path)) - { - require($old_path); - } + global $phpbb_root_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); + } } phpbb_require_updated('includes/startup.' . $phpEx); |