Replace user_access() calls with $account->hasPermission() in language module

Nice clean-up!

@@ -161,7 +161,8 @@ function language_menu() {
 function language_access_language_edit_or_delete($language) {
-  return !$language->locked && user_access('administer languages');
+  $account = Drupal::request()->attributes->get('_account');
+  return !$language->locked && $account->hasPermission('administer languages');

Suppose this function would be droped in wscci conversion for 'language_admin_edit_form' and 'language_admin_delete_form'

1. +++ b/core/modules/language/lib/Drupal/language/LanguageAccessController.php
   @@ -22,7 +22,8 @@ public function access(EntityInterface $entity, $operation, $langcode = Language
   
   @@ -22,7 +22,8 @@ public function access(EntityInterface $entity, $operation, $langcode = Language
   +        $account = \Drupal::request()->attributes->get('_account');
   

   This method has the account passed to it directly.

+++ b/core/modules/language/language.module
@@ -161,7 +161,8 @@ function language_menu() {
 function language_access_language_edit_or_delete($language) {
...
+  $account = Drupal::request()->attributes->get('_account');

Should be Drupal::currentUser() according https://drupal.org/node/2032447

1. +++ b/core/modules/language/language.module
   @@ -149,7 +149,8 @@ function language_menu() {
   +  $account = Drupal::currentUser();
   +  return !$language->locked && $account->HasPermission('administer languages');
   

   Please do not use $account here. Drupal::currentUser()->hasPermission() works fine

2. +++ b/core/modules/language/lib/Drupal/language/LanguageAccessController.php
   @@ -18,11 +18,12 @@ class LanguageAccessController extends EntityAccessController {
   +    $account = is_null($account) ? \Drupal::currentUser() : $account;
   

   This is a hack, but reasonable

Use this to replace 2 hack

$account = $this->prepareUser($account);

+++ b/core/modules/language/lib/Drupal/language/LanguageAccessController.php
@@ -18,11 +18,12 @@ class LanguageAccessController extends EntityAccessController {
+    $account = is_null($account) ? \Drupal::currentUser() : $account;

$account = $this->prepareUser($account);

+++ b/core/modules/language/lib/Drupal/language/LanguageAccessController.php
@@ -18,11 +18,12 @@ class LanguageAccessController extends EntityAccessController {
   public function access(EntityInterface $entity, $operation, $langcode = Language::LANGCODE_DEFAULT, AccountInterface $account = NULL) {
+    $account = $this->prepareUser($account);
     switch ($operation) {
       case 'create':
       case 'update':
       case 'delete':
-        return !$entity->locked && user_access('administer languages');
+        return !$entity->locked && $account->hasPermission('administer languages');
         break;
     }
     return FALSE;

This should be overriding checkAccess() and checkCreateAccess() instead. Then you don't need the prepareUser call.

Thanks, corrected patch regarding to comment above.

#14: drupal-language_replace_user_access-2062001-14.patch queued for re-testing.

+++ b/core/modules/language/language.module
@@ -135,7 +135,7 @@ function language_menu() {
+  return !$language->locked && Drupal::currentUser()->hasPermission('administer languages');

\Drupal according #2053489: Standardize on \Drupal throughout core

This needs to be re-rolled because the patch no longer applies.

Great!

Committed and pushed to 8.x. Thanks!