diff --git a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
index f3d4e38..7444fa1 100644
--- a/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
+++ b/core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php
@@ -68,7 +68,7 @@ protected function textFormatHasTransformationFilters($format_id) {
    * Implements \Drupal\edit\EditPluginInterface::getAttachments().
    */
   public function getAttachments() {
-    $user_format_ids = array_keys(filter_formats(user_load($GLOBALS['user']->uid)));
+    $user_format_ids = array_keys(filter_formats(\Drupal::request()->attributes->get('account')));
     $manager = \Drupal::service('plugin.manager.editor');
     $definitions = $manager->getDefinitions();
 
diff --git a/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php b/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php
index de537a7..0d49189 100644
--- a/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php
+++ b/core/modules/filter/lib/Drupal/filter/FilterFormatAccessController.php
@@ -26,21 +26,21 @@ protected function checkAccess(EntityInterface $entity, $operation, $langcode, A
       return TRUE;
     }
 
-    if ($operation != 'view' && user_access('administer filters', $account)) {
+    if ($operation != 'view' && $account->hasPermission('administer filters')) {
       return TRUE;
     }
 
     // Check the permission if one exists; otherwise, we have a non-existent
     // format so we return FALSE.
     $permission = $entity->getPermissionName();
-    return !empty($permission) && user_access($permission, $account);
+    return !empty($permission) && $account->hasPermission($permission);
   }
 
   /**
    * {@inheritdoc}
    */
   protected function checkCreateAccess(AccountInterface $account, array $context, $entity_bundle = NULL) {
-    return user_access('administer filters', $account);
+    return $account->hasPermission('administer filters');
   }
 
 }