From 2801415c1ca5e1c545a602520c457ed5d8a3d70b Mon Sep 17 00:00:00 2001 From: rxu Date: Thu, 28 Oct 2021 20:48:02 +0700 Subject: [PATCH] [ticket/16895] Rename language entry PHPBB3-16895 --- phpBB/language/en/migrator.php | 2 +- phpBB/phpbb/db/migration/tool/permission.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/phpBB/language/en/migrator.php b/phpBB/language/en/migrator.php index 5fdee79365..e5d7eff609 100644 --- a/phpBB/language/en/migrator.php +++ b/phpBB/language/en/migrator.php @@ -77,6 +77,6 @@ $lang = array_merge($lang, array( 'PARENT_MODULE_FIND_ERROR' => 'Unable to determine the parent module identifier: %s', '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_ASSIGNED' => 'The permission role assigned to group "%1$s" unexpectedly does not exist. Role id: "%2$s"', )); diff --git a/phpBB/phpbb/db/migration/tool/permission.php b/phpBB/phpbb/db/migration/tool/permission.php index 8c86d0b7f2..66ca2ed0ee 100644 --- a/phpBB/phpbb/db/migration/tool/permission.php +++ b/phpBB/phpbb/db/migration/tool/permission.php @@ -492,7 +492,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface $role_data = $this->db->sql_fetchrow(); 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']; @@ -643,7 +643,7 @@ class permission implements \phpbb\db\migration\tool\tool_interface $role_name = $this->db->sql_fetchfield('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');