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

[ticket/10223] Make definition of phpbb_require_updated conditional

Browse source 
The automatic updater defines it too and includes database_update.php
for updating which causes an error otherwise.

PHPBB3-10223
This commit is contained in:
Nils Adermann 2011-06-20 00:00:30 +02:00
parent 67fde80fbb
commit ad5ed9d0ee
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/install/database_update.php
View file

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