diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index 6000391..a127089 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -168,9 +168,12 @@ function filter_permission() { 'restrict access' => TRUE, ); + // @todo During installation, hook_permission() is called too early to use the + // current implementation of Drupal::currentUser(). + $account = Drupal::getContainer()->isScopeActive('request') ? Drupal::currentUser() : $GLOBALS['user']; // Generate permissions for each text format. Warn the administrator that any // of them are potentially unsafe. - $administer_filters = Drupal::currentUser()->hasPermission('administer filters'); + $administer_filters = $account->hasPermission('administer filters'); foreach (filter_formats() as $format) { $permission = $format->getPermissionName(); if (!empty($permission)) {