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

[ticket/16895] Rename language entry

Browse Source 
PHPBB3-16895
This commit is contained in:
rxu
2021-10-28 20:48:02 +07:00
parent 7275cdd152
commit 2801415c1c
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/language/en/migrator.php
View File

@@ -77,6 +77,6 @@ $lang = array_merge($lang, array(
'PARENT_MODULE_FIND_ERROR' => 'Unable to determine the parent module identifier: %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_ASSIGNED_NOT_EXIST' => 'The permission role assigned to group "%1$s" unexpectedly does not exist. Role id: "%2$s"',
'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.', 'ROLE_NOT_EXIST' => 'The permission role "%s" unexpectedly does not exist.',
'ROLE_NOT_EXIST_ASSIGNED' => 'The permission role assigned to group "%1$s" unexpectedly does not exist. Role id: "%2$s"',
)); ));

4
phpBB/phpbb/db/migration/tool/permission.php
View File

@@ -492,7 +492,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
$role_data = $this->db->sql_fetchrow(); $role_data = $this->db->sql_fetchrow();
if (!$role_data) if (!$role_data)
{ {
throw new \phpbb\db\migration\exception('ROLE_NOT_EXIST_ASSIGNED', $name, $role_id); throw new \phpbb\db\migration\exception('ROLE_ASSIGNED_NOT_EXIST', $name, $role_id);
} }
$role_name = $role_data['role_name']; $role_name = $role_data['role_name'];
@@ -643,7 +643,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface
$role_name = $this->db->sql_fetchfield('role_name'); $role_name = $this->db->sql_fetchfield('role_name');
if (!$role_name) if (!$role_name)
{ {
throw new \phpbb\db\migration\exception('ROLE_NOT_EXIST_ASSIGNED', $name, $role_id); throw new \phpbb\db\migration\exception('ROLE_ASSIGNED_NOT_EXIST', $name, $role_id);
} }
return $this->permission_unset($role_name, $auth_option, 'role'); return $this->permission_unset($role_name, $auth_option, 'role');