mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-11 03:04:09 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/10223] Replace spaces with tabs
This commit is contained in:
Andreas Fischer
2011-06-19 23:12:45 +02:00
parent bd4a781c15 1320bb7bf8
commit fc6cdc7eec
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
phpBB/install/database_update.php
View File

@@ -35,19 +35,19 @@ $phpEx = substr(strrchr(__FILE__, '.'), 1);
function phpbb_require_updated($path, $optional = false)
{
global $phpbb_root_path;
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);
}
}
phpbb_require_updated('includes/startup.' . $phpEx);