From 33db26d0cf3161edb7c840c499c94f5b8f14a4e9 Mon Sep 17 00:00:00 2001 From: Mate Bartus Date: Wed, 28 Oct 2015 01:12:52 +0100 Subject: [PATCH] [ticket/14044] global $table_prefix in constants.php PHPBB3-14044 --- phpBB/includes/constants.php | 3 +++ phpBB/phpbb/install/module/update_database/task/update.php | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index bd73201290..f6d62fcdf4 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -221,6 +221,9 @@ define('CAPTCHA_MAX_CHARS', 7); // Additional constants define('VOTE_CONVERTED', 127); +// BC global FTW +global $table_prefix; + // Table names define('ACL_GROUPS_TABLE', $table_prefix . 'acl_groups'); define('ACL_OPTIONS_TABLE', $table_prefix . 'acl_options'); diff --git a/phpBB/phpbb/install/module/update_database/task/update.php b/phpBB/phpbb/install/module/update_database/task/update.php index 015935e1de..2d640134a3 100644 --- a/phpBB/phpbb/install/module/update_database/task/update.php +++ b/phpBB/phpbb/install/module/update_database/task/update.php @@ -98,10 +98,6 @@ class update extends task_base $this->language = $language; $this->phpbb_root_path = $phpbb_root_path; - // BC global for migrations - global $table_prefix; - $table_prefix = $container->get_parameter('table_prefix'); - $this->cache = $container->get('cache.driver'); $this->config = $container->get('config'); $this->extension_manager = $container->get('ext.manager');