diff options
| author | rxu <rxu@mail.ru> | 2016-07-03 02:23:34 +0700 |
|---|---|---|
| committer | rxu <rxu@mail.ru> | 2016-07-03 02:23:34 +0700 |
| commit | a3c10f575ba09b63de044edce835fbdd423fec63 (patch) | |
| tree | 124521c97c906703be055c0f406b3c5e6c67c837 /phpBB/phpbb/db/migration/tool | |
| parent | 2f53761eaf8fd6991a7af4e31c8ecefe30013cab (diff) | |
| download | forums-a3c10f575ba09b63de044edce835fbdd423fec63.tar forums-a3c10f575ba09b63de044edce835fbdd423fec63.tar.gz forums-a3c10f575ba09b63de044edce835fbdd423fec63.tar.bz2 forums-a3c10f575ba09b63de044edce835fbdd423fec63.tar.xz forums-a3c10f575ba09b63de044edce835fbdd423fec63.zip | |
[ticket/14703] Fix parent module selection for custom modules removal
PHPBB3-14703
Diffstat (limited to 'phpBB/phpbb/db/migration/tool')
| -rw-r--r-- | phpBB/phpbb/db/migration/tool/module.php | 6 |
1 files 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); |