makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/14831] Fix module migrator tool

Browse source 
PHPBB3-14831
This commit is contained in:
rxu 2016-10-22 21:40:21 +07:00
parent 05d0879795
commit 0cc0920734
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/db/migration/tool/module.php
View file

@ -197,7 +197,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
if ($this->exists($class, $parent, $data['module_langname'])) if ($this->exists($class, $parent, $data['module_langname']))
{ {
throw new \phpbb\db\migration\exception('MODULE_EXISTS', $module_id); throw new \phpbb\db\migration\exception('MODULE_EXISTS', $data['module_langname']);
} }
if (!class_exists('acp_modules')) if (!class_exists('acp_modules'))
@ -448,12 +448,11 @@ class module implements \phpbb\db\migration\tool\tool_interface
protected function get_categories_list() protected function get_categories_list()
{ {
// Select the top level categories // Select the top level categories
// and 2nd level [sub]categories which exist for ACP only // and 2nd level [sub]categories
$sql = 'SELECT m2.module_id, m2.module_langname $sql = 'SELECT m2.module_id, m2.module_langname
FROM ' . $this->modules_table . ' m1, ' . $this->modules_table . " m2 FROM ' . $this->modules_table . ' m1, ' . $this->modules_table . " m2
WHERE m1.parent_id = 0 WHERE m1.parent_id = 0
AND (m1.module_id = m2.module_id AND (m1.module_id = m2.module_id OR m2.parent_id = m1.module_id)
OR m2.module_class = 'acp' AND m2.parent_id = m1.module_id)
ORDER BY m1.module_id, m2.module_id ASC"; ORDER BY m1.module_id, m2.module_id ASC";
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);