1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 13:35:13 +02:00

Merge branch 'prep-release-3.0.9' into develop-olympus

* prep-release-3.0.9:
  [ticket/10223] Make definition of phpbb_require_updated conditional
This commit is contained in:
Andreas Fischer
2011-06-20 00:28:35 +02:00

View File

@ -34,20 +34,23 @@ define('IN_INSTALL', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../'; $phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1); $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)
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
$old_path = $phpbb_root_path . $path;
if (file_exists($new_path))
{ {
require($new_path); global $phpbb_root_path;
}
else if (!$optional || file_exists($old_path)) $new_path = $phpbb_root_path . 'install/update/new/' . $path;
{ $old_path = $phpbb_root_path . $path;
require($old_path);
if (file_exists($new_path))
{
require($new_path);
}
else if (!$optional || file_exists($old_path))
{
require($old_path);
}
} }
} }