mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
[ticket/11574] Fix table prefix in database updater
PHPBB3-11574
This commit is contained in:
parent
d6de892ee4
commit
c96f8936c9
2 changed files with 3 additions and 2 deletions
|
@ -25,7 +25,7 @@ if (!function_exists('phpbb_require_updated'))
|
||||||
{
|
{
|
||||||
function phpbb_require_updated($path, $optional = false)
|
function phpbb_require_updated($path, $optional = false)
|
||||||
{
|
{
|
||||||
global $phpbb_root_path;
|
global $phpbb_root_path, $table_prefix;
|
||||||
|
|
||||||
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
|
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
|
||||||
$old_path = $phpbb_root_path . $path;
|
$old_path = $phpbb_root_path . $path;
|
||||||
|
@ -108,6 +108,7 @@ phpbb_require_updated('includes/functions.' . $phpEx);
|
||||||
phpbb_require_updated('includes/functions_content.' . $phpEx);
|
phpbb_require_updated('includes/functions_content.' . $phpEx);
|
||||||
phpbb_require_updated('includes/functions_container.' . $phpEx);
|
phpbb_require_updated('includes/functions_container.' . $phpEx);
|
||||||
|
|
||||||
|
require($phpbb_root_path . 'config.' . $phpEx);
|
||||||
phpbb_require_updated('includes/constants.' . $phpEx);
|
phpbb_require_updated('includes/constants.' . $phpEx);
|
||||||
phpbb_require_updated('includes/utf/utf_tools.' . $phpEx);
|
phpbb_require_updated('includes/utf/utf_tools.' . $phpEx);
|
||||||
|
|
||||||
|
|
|
@ -28,7 +28,7 @@ if (version_compare(PHP_VERSION, '5.3.3') < 0)
|
||||||
|
|
||||||
function phpbb_require_updated($path, $optional = false)
|
function phpbb_require_updated($path, $optional = false)
|
||||||
{
|
{
|
||||||
global $phpbb_root_path;
|
global $phpbb_root_path, $table_prefix;
|
||||||
|
|
||||||
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
|
$new_path = $phpbb_root_path . 'install/update/new/' . $path;
|
||||||
$old_path = $phpbb_root_path . $path;
|
$old_path = $phpbb_root_path . $path;
|
||||||
|
|
Loading…
Add table
Reference in a new issue