Issue #2563995 by Temoor, Rakhi Soni, andypost: Remove duplicated check for...

Issue #2563995 by Temoor, Rakhi Soni, andypost: Remove duplicated check for isAdmin() in RoleStorage::isPermissionInRoles()

core/modules/user/src/RoleStorage.php

@@ -13,16 +13,14 @@ class RoleStorage extends ConfigEntityStorage implements RoleStorageInterface {
    * {@inheritdoc}
    */
   public function isPermissionInRoles($permission, array $rids) {
-    $has_permission = FALSE;
     foreach ($this->loadMultiple($rids) as $role) {
       /** @var \Drupal\user\RoleInterface $role */
-      if ($role->isAdmin() || $role->hasPermission($permission)) {
-        $has_permission = TRUE;
-        break;
+      if ($role->hasPermission($permission)) {
+        return TRUE;
       }
     }
 
-    return $has_permission;
+    return FALSE;
   }
 
 }