From a3c10f575ba09b63de044edce835fbdd423fec63 Mon Sep 17 00:00:00 2001 From: rxu Date: Sun, 3 Jul 2016 02:23:34 +0700 Subject: [PATCH] [ticket/14703] Fix parent module selection for custom modules removal PHPBB3-14703 --- phpBB/phpbb/db/migration/tool/module.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/phpBB/phpbb/db/migration/tool/module.php b/phpBB/phpbb/db/migration/tool/module.php index d01b659a0e..64c37fe894 100644 --- a/phpBB/phpbb/db/migration/tool/module.php +++ b/phpBB/phpbb/db/migration/tool/module.php @@ -95,7 +95,8 @@ class module implements \phpbb\db\migration\tool\tool_interface $sql = 'SELECT module_id FROM ' . $this->modules_table . " WHERE module_langname = '" . $this->db->sql_escape($parent) . "' - AND module_class = '" . $this->db->sql_escape($class) . "'"; + AND module_class = '" . $this->db->sql_escape($class) . "' + AND module_basename = ''"; $result = $this->db->sql_query($sql); $module_id = $this->db->sql_fetchfield('module_id'); $this->db->sql_freeresult($result); @@ -384,7 +385,8 @@ class module implements \phpbb\db\migration\tool\tool_interface $sql = 'SELECT module_id FROM ' . $this->modules_table . " WHERE module_langname = '" . $this->db->sql_escape($parent) . "' - AND module_class = '" . $this->db->sql_escape($class) . "'"; + AND module_class = '" . $this->db->sql_escape($class) . "' + AND module_basename = ''"; $result = $this->db->sql_query($sql); $module_id = $this->db->sql_fetchfield('module_id'); $this->db->sql_freeresult($result);