From da833c9ed80df9f5288d18559af238cdff03205c Mon Sep 17 00:00:00 2001
From: Jennifer Hodgdon <yahgrp@poplarware.com>
Date: Tue, 24 Sep 2013 16:43:49 -0700
Subject: [PATCH] Issue #2084653 by longwave, joachim: Add inline comments to
 config sorting

---
 .../Drupal/Core/Config/Entity/ConfigEntityListController.php   | 3 +++
 core/modules/block/lib/Drupal/block/BlockListController.php    | 1 +
 .../language/lib/Drupal/language/LanguageListController.php    | 3 +++
 core/modules/user/lib/Drupal/user/RoleStorageController.php    | 1 +
 4 files changed, 8 insertions(+)

diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
index 0eb187a102a3..b363cc413f3f 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 03e346278eb5..697f09bf3449 100644
--- a/core/modules/block/lib/Drupal/block/BlockListController.php
+++ b/core/modules/block/lib/Drupal/block/BlockListController.php
@@ -101,6 +101,7 @@ class BlockListController extends ConfigEntityListController implements FormInte
     // @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 d33b9f4b72c3..669028fa761c 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 163c23263774..03937a65cb17 100644
--- a/core/modules/user/lib/Drupal/user/RoleStorageController.php
+++ b/core/modules/user/lib/Drupal/user/RoleStorageController.php
@@ -29,6 +29,7 @@ class RoleStorageController extends ConfigStorageController implements RoleStora
    */
   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);