diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php index bdeed8c..6cf82fc 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListBuilder.php @@ -21,7 +21,7 @@ class ConfigEntityListBuilder extends EntityListBuilder { * {@inheritdoc} */ public function load() { - $entities = $this->storage->loadMultipleOriginal(); + $entities = $this->storage->loadMultipleOverrideFree(); // Sort the entities using the entity class's sort() method. // See \Drupal\Core\Config\Entity\ConfigEntityBase::sort(). diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php index e8e23aa..7057491 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php @@ -423,7 +423,7 @@ public function updateFromStorageRecord(ConfigEntityInterface $entity, array $va /** * {@inheritdoc} */ - public function loadOriginal($id) { + public function loadOverrideFree($id) { $old_state = $this->configFactory->getOverrideState(); $this->configFactory->setOverrideState(FALSE); $entity = $this->load($id); @@ -434,7 +434,7 @@ public function loadOriginal($id) { /** * {@inheritdoc} */ - public function loadMultipleOriginal(array $ids = NULL) { + public function loadMultipleOverrideFree(array $ids = NULL) { $old_state = $this->configFactory->getOverrideState(); $this->configFactory->setOverrideState(FALSE); $entities = $this->loadMultiple($ids); diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorageInterface.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorageInterface.php index 78048e4..78d86df 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorageInterface.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorageInterface.php @@ -74,7 +74,7 @@ public function updateFromStorageRecord(ConfigEntityInterface $entity, array $va * @return \Drupal\Core\Entity\EntityInterface|null * An entity object. NULL if no matching entity is found. */ - public function loadOriginal($id); + public function loadOverrideFree($id); /** * Loads one or more entities in their original form without overrides. @@ -86,6 +86,6 @@ public function loadOriginal($id); * An array of entity objects indexed by their IDs. Returns an empty array * if no matching entities found. */ - public function loadMultipleOriginal(array $ids = NULL); + public function loadMultipleOverrideFree(array $ids = NULL); } diff --git a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueConfigEntityStorage.php b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueConfigEntityStorage.php index 3f0df02..b55cee0 100644 --- a/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueConfigEntityStorage.php +++ b/core/lib/Drupal/Core/Entity/KeyValueStore/KeyValueConfigEntityStorage.php @@ -78,7 +78,7 @@ public function updateFromStorageRecord(ConfigEntityInterface $entity, array $va /** * {@inheritdoc} */ - public function loadOriginal($id) { + public function loadOverrideFree($id) { $old_state = $this->configFactory->getOverrideState(); $this->configFactory->setOverrideState(FALSE); $entity = $this->load($id); @@ -89,7 +89,7 @@ public function loadOriginal($id) { /** * {@inheritdoc} */ - public function loadMultipleOriginal(array $ids = NULL) { + public function loadMultipleOverrideFree(array $ids = NULL) { $old_state = $this->configFactory->getOverrideState(); $this->configFactory->setOverrideState(FALSE); $entities = $this->loadMultiple($ids);