diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php index 0eb187a..a3fae19 100644 --- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php +++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php @@ -20,6 +20,9 @@ class ConfigEntityListController extends EntityListController { */ public function load() { $entities = parent::load(); + + // Sort the entities using the entity class's sort() method. + // @see \Drupal\Core\Config\Entity\ConfigEntityBase::sort() uasort($entities, array($this->entityInfo['class'], 'sort')); return $entities; } diff --git a/core/modules/block/lib/Drupal/block/BlockListController.php b/core/modules/block/lib/Drupal/block/BlockListController.php index b9d6218..b7241e6 100644 --- a/core/modules/block/lib/Drupal/block/BlockListController.php +++ b/core/modules/block/lib/Drupal/block/BlockListController.php @@ -92,6 +92,7 @@ public function load() { // @todo Move the functionality of _block_rehash() out of the listing page. $entities = _block_rehash($this->theme); + // Sort the blocks using \Drupal\block\Entity\Block::sort(). uasort($entities, array($this->entityInfo['class'], 'sort')); return $entities; } diff --git a/core/modules/language/lib/Drupal/language/LanguageListController.php b/core/modules/language/lib/Drupal/language/LanguageListController.php index d33b9f4..52fb796 100644 --- a/core/modules/language/lib/Drupal/language/LanguageListController.php +++ b/core/modules/language/lib/Drupal/language/LanguageListController.php @@ -24,6 +24,9 @@ class LanguageListController extends DraggableListController { */ public function load() { $entities = $this->storage->loadByProperties(array('locked' => '0')); + + // Sort the entities using the entity class's sort() method. + // @see \Drupal\Core\Config\Entity\ConfigEntityBase::sort() uasort($entities, array($this->entityInfo['class'], 'sort')); return $entities; } diff --git a/core/modules/user/lib/Drupal/user/RoleStorageController.php b/core/modules/user/lib/Drupal/user/RoleStorageController.php index 163c232..9c839f7 100644 --- a/core/modules/user/lib/Drupal/user/RoleStorageController.php +++ b/core/modules/user/lib/Drupal/user/RoleStorageController.php @@ -29,6 +29,7 @@ public function deleteRoleReferences(array $rids) { */ protected function attachLoad(&$queried_entities, $revision_id = FALSE) { // Sort the queried roles by their weight. + // @see \Drupal\Core\Config\Entity\ConfigEntityBase::sort() uasort($queried_entities, array($this->entityInfo['class'], 'sort')); parent::attachLoad($queried_entities, $revision_id);