opdavies/drupalcampbristol
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update to Drupal 8.1.0. For more information, see https://www.drupal.org/drupal-8.1.0-release-notes

Browse source
This commit is contained in:
Pantheon Automation 2016-04-20 09:56:34 -07:00 • committed by Greg Anderson
parent b11a755ba8
commit c0a0d5a94c
6920 changed files with 64395 additions and 57312 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/modules/user/src/PermissionHandler.php
View file

@ -1,10 +1,5 @@
<?php
/**
* @file
* Contains \Drupal\user\PermissionHandler.
*/
namespace Drupal\user;
use Drupal\Component\Discovery\YamlDiscovery;
@ -163,8 +158,8 @@ class PermissionHandler implements PermissionHandlerInterface {
$callback_permission += array(
'description' => NULL,
'provider' => $provider,
);
$callback_permission['provider'] = $provider;
$all_callback_permissions[$name] = $callback_permission;
}
@ -182,7 +177,7 @@ class PermissionHandler implements PermissionHandlerInterface {
}
$permission['title'] = $this->t($permission['title']);
$permission['description'] = isset($permission['description']) ? $this->t($permission['description']) : NULL;
$permission['provider'] = $provider;
$permission['provider'] = !empty($permission['provider']) ? $permission['provider'] : $provider;
}
$all_permissions += $permissions;