mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/13777] Use module manager in phpBB core files

Browse Source 
PHPBB3-13777
This commit is contained in:
MateBartus
2015-05-31 13:21:45 +02:00
parent e877a752be
commit 77ee0e62ca
4 changed files with 47 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/phpbb/db/migration/data/v310/acp_prune_users_module.php
View File

@@ -13,7 +13,7 @@
namespace phpbb\db\migration\data\v310;
class acp_prune_users_module extends \phpbb\db\migration\migration
class acp_prune_users_module extends \phpbb\db\migration\container_aware_migration
{
public function effectively_installed()
{
@@ -70,12 +70,7 @@ class acp_prune_users_module extends \phpbb\db\migration\migration
$acp_cat_users_id = (int) $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
if (!class_exists('\acp_modules'))
{
include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
}
$module_manager = new \acp_modules();
$module_manager->module_class = 'acp';
$module_manager->move_module($acp_prune_users_id, $acp_cat_users_id);
$module_manager = $this->container->get('module.manager');
$module_manager->move_module($acp_prune_users_id, $acp_cat_users_id, 'acp');
}
}

11
phpBB/phpbb/db/migration/data/v310/dev.php
View File

@@ -13,7 +13,7 @@
namespace phpbb\db\migration\data\v310;
class dev extends \phpbb\db\migration\migration
class dev extends \phpbb\db\migration\container_aware_migration
{
public function effectively_installed()
{
@@ -204,18 +204,13 @@ class dev extends \phpbb\db\migration\migration
$language_management_module_id = $this->db->sql_fetchfield('module_id');
$this->db->sql_freeresult($result);
if (!class_exists('acp_modules'))
{
include($this->phpbb_root_path . 'includes/acp/acp_modules.' . $this->php_ext);
}
// acp_modules calls adm_back_link, which is undefined at this point
if (!function_exists('adm_back_link'))
{
include($this->phpbb_root_path . 'includes/functions_acp.' . $this->php_ext);
}
$module_manager = new \acp_modules();
$module_manager->module_class = 'acp';
$module_manager->move_module($language_module_id, $language_management_module_id);
$module_manager = $this->container->get('module.manager');
$module_manager->move_module($language_module_id, $language_management_module_id, 'acp');
}
public function update_ucp_pm_basename()