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

[ticket/14703] Select the parent module id from the several found

Browse source 
PHPBB3-14703
This commit is contained in:
rxu 2016-07-23 20:54:16 +07:00
parent 652e3da28d
commit eaafb758ce
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/language/en/migrator.php
View file

@ -65,6 +65,7 @@ $lang = array_merge($lang, array(
'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s', 'MODULE_INFO_FILE_NOT_EXIST' => 'A required module info file is missing: %2$s',
'MODULE_NOT_EXIST' => 'A required module does not exist: %s', 'MODULE_NOT_EXIST' => 'A required module does not exist: %s',
'PARENT_MODULE_FIND_ERROR' => 'Unable to determine the parent module identifier: %s',
'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.', 'PERMISSION_NOT_EXIST' => 'The permission setting "%s" unexpectedly does not exist.',
'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.',

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

@ -158,7 +158,7 @@ class module implements \phpbb\db\migration\tool\tool_interface
$data = array('module_langname' => $data); $data = array('module_langname' => $data);
} }
$parent = $data['parent_id'] = $this->get_parent_module_id($parent); $parent = $data['parent_id'] = $this->get_parent_module_id($parent, $data);
if (!isset($data['module_langname'])) if (!isset($data['module_langname']))
{ {
@ -463,10 +463,11 @@ class module implements \phpbb\db\migration\tool\tool_interface
* Get parent module id * Get parent module id
* *
* @param string|int $parent_id The parent module_id|module_langname * @param string|int $parent_id The parent module_id|module_langname
* @param array $data The module data array
* @return int The parent module_id * @return int The parent module_id
* @throws \phpbb\db\migration\exception * @throws \phpbb\db\migration\exception
*/ */
public function get_parent_module_id($parent_id) public function get_parent_module_id($parent_id, $data = array())
{ {
// Allow '' to be sent as 0 // Allow '' to be sent as 0
$parent_id = $parent_id ?: 0; $parent_id = $parent_id ?: 0;
@ -492,8 +493,26 @@ class module implements \phpbb\db\migration\tool\tool_interface
break; break;
// Several modules with the given module_langname were found // Several modules with the given module_langname were found
// Try to determine the parent_id by the neighbour module parent
default: default:
if (!empty($data) && (isset($data['before']) || isset($data['after'])))
{
$neighbour_module_langname = isset($data['before']) ? $data['before'] : $data['after'];
$sql = 'SELECT parent_id
FROM ' . MODULES_TABLE . '
WHERE module_langname ' . $this->db->sql_escape($neighbour_module_langname) . '
AND ' . $this->db->sql_in_set('parent_id', $ids);
$result = $this->db->sql_query($sql);
$parent_id = (int) $this->db->sql_fetchfield('parent_id');
if (!$parent_id)
{
throw new \phpbb\db\migration\exception('PARENT_MODULE_FIND_ERROR', $data['parent_id']);
}
}
else
{
throw new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id); throw new \phpbb\db\migration\exception('MODULE_EXIST_MULTIPLE', $parent_id);
}
break; break;
} }
} }