diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 23:12:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-19 23:12:45 +0200 |
| commit | fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b (patch) | |
| tree | 46560796890c2c05215ec34eb78e84ae4a53da6f | |
| parent | bd4a781c15724228786309968ff3c79cf6d24569 (diff) | |
| parent | 1320bb7bf84c393a6a3821326a6444a3ce94640f (diff) | |
| download | forums-fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b.tar forums-fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b.tar.gz forums-fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b.tar.bz2 forums-fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b.tar.xz forums-fc6cdc7eec8d3119c1daf2e0d214a2df2291ec2b.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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 e2f5b76fed..b368de80fc 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -35,19 +35,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 648f037533..93961de333 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); |