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
commit e0ecd3e118

View file

@ -34,6 +34,8 @@ define('IN_INSTALL', true);
$phpbb_root_path = (defined('PHPBB_ROOT_PATH')) ? PHPBB_ROOT_PATH : './../';
$phpEx = substr(strrchr(__FILE__, '.'), 1);
if (!function_exists('phpbb_require_updated'))
{
function phpbb_require_updated($path, $optional = false)
{
global $phpbb_root_path;
@ -50,6 +52,7 @@ function phpbb_require_updated($path, $optional = false)
require($old_path);
}
}
}
phpbb_require_updated('includes/startup.' . $phpEx);