From 0c957d310a21d0888c9abe6c6ac189ba0de2c573 Mon Sep 17 00:00:00 2001 From: Alex Pott Date: Sat, 29 Jun 2013 11:34:03 +0100 Subject: [PATCH] Issue #2031115 by tim.plunkett: Fixed Language::LANGUAGE_DEFAULT should be Language::LANGCODE_DEFAULT. --- core/lib/Drupal/Core/Entity/EntityAccessController.php | 2 +- .../modules/action/lib/Drupal/action/ActionAccessController.php | 2 +- .../lib/Drupal/config_test/ConfigTestAccessController.php | 2 +- core/modules/views/lib/Drupal/views/ViewAccessController.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/lib/Drupal/Core/Entity/EntityAccessController.php b/core/lib/Drupal/Core/Entity/EntityAccessController.php index 2c9d6fdcd98..a3284437183 100644 --- a/core/lib/Drupal/Core/Entity/EntityAccessController.php +++ b/core/lib/Drupal/Core/Entity/EntityAccessController.php @@ -25,7 +25,7 @@ class EntityAccessController implements EntityAccessControllerInterface { /** * {@inheritdoc} */ - public function access(EntityInterface $entity, $operation, $langcode = Language::LANGUAGE_DEFAULT, AccountInterface $account = NULL) { + public function access(EntityInterface $entity, $operation, $langcode = Language::LANGCODE_DEFAULT, AccountInterface $account = NULL) { if (!$account) { $account = $GLOBALS['user']; } diff --git a/core/modules/action/lib/Drupal/action/ActionAccessController.php b/core/modules/action/lib/Drupal/action/ActionAccessController.php index 90a8e5c0c4c..d94edd3815d 100644 --- a/core/modules/action/lib/Drupal/action/ActionAccessController.php +++ b/core/modules/action/lib/Drupal/action/ActionAccessController.php @@ -17,7 +17,7 @@ class ActionAccessController extends EntityAccessController { /** * {@inheritdoc} */ - public function access(EntityInterface $entity, $operation, $langcode = Language::LANGUAGE_DEFAULT, AccountInterface $account = NULL) { + public function access(EntityInterface $entity, $operation, $langcode = Language::LANGCODE_DEFAULT, AccountInterface $account = NULL) { return user_access('administer actions', $account); } diff --git a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php index c973c5aba4b..cde6f413bfb 100644 --- a/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php +++ b/core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestAccessController.php @@ -20,7 +20,7 @@ class ConfigTestAccessController extends EntityAccessController { /** * {@inheritdoc} */ - public function access(EntityInterface $entity, $operation, $langcode = Language::LANGUAGE_DEFAULT, AccountInterface $account = NULL) { + public function access(EntityInterface $entity, $operation, $langcode = Language::LANGCODE_DEFAULT, AccountInterface $account = NULL) { return TRUE; } diff --git a/core/modules/views/lib/Drupal/views/ViewAccessController.php b/core/modules/views/lib/Drupal/views/ViewAccessController.php index 7fee713e53e..a4aaae63a8c 100644 --- a/core/modules/views/lib/Drupal/views/ViewAccessController.php +++ b/core/modules/views/lib/Drupal/views/ViewAccessController.php @@ -20,7 +20,7 @@ class ViewAccessController extends EntityAccessController { /** * {@inheritdoc} */ - public function access(EntityInterface $entity, $operation, $langcode = Language::LANGUAGE_DEFAULT, AccountInterface $account = NULL) { + public function access(EntityInterface $entity, $operation, $langcode = Language::LANGCODE_DEFAULT, AccountInterface $account = NULL) { return $operation == 'view' || user_access('administer views', $account); }