makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 21:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'naderman/ticket/10223' into prep-release-3.0.9

Browse source 
* naderman/ticket/10223:
  [ticket/10223] Replace spaces with tabs
This commit is contained in:
Andreas Fischer 2011-06-19 23:11:57 +02:00
commit 6a4ca8cad9
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
phpBB/install/database_update.php
View file

@ -36,19 +36,19 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
function phpbb_require_updated($path, $optional = false) function phpbb_require_updated($path, $optional = false)
{ {
global $phpbb_root_path; global $phpbb_root_path;
$new_path = $phpbb_root_path . 'install/update/new/' . $path; $new_path = $phpbb_root_path . 'install/update/new/' . $path;
$old_path = $phpbb_root_path . $path; $old_path = $phpbb_root_path . $path;
if (file_exists($new_path)) if (file_exists($new_path))
{ {
require($new_path); require($new_path);
} }
else if (!$optional || file_exists($old_path)) else if (!$optional || file_exists($old_path))
{ {
require($old_path); require($old_path);
} }
} }
phpbb_require_updated('includes/startup.' . $phpEx); phpbb_require_updated('includes/startup.' . $phpEx);

22
phpBB/install/index.php
View file

@ -26,19 +26,19 @@ if (version_compare(PHP_VERSION, '4.3.3') < 0)
function phpbb_require_updated($path, $optional = false) function phpbb_require_updated($path, $optional = false)
{ {
global $phpbb_root_path; global $phpbb_root_path;
$new_path = $phpbb_root_path . 'install/update/new/' . $path; $new_path = $phpbb_root_path . 'install/update/new/' . $path;
$old_path = $phpbb_root_path . $path; $old_path = $phpbb_root_path . $path;
if (file_exists($new_path)) if (file_exists($new_path))
{ {
require($new_path); require($new_path);
} }
else if (!$optional || file_exists($old_path)) else if (!$optional || file_exists($old_path))
{ {
require($old_path); require($old_path);
} }
} }
phpbb_require_updated('includes/startup.' . $phpEx); phpbb_require_updated('includes/startup.' . $phpEx);