mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases 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

27
phpBB/install/database_update.php
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);
}
} }
} }