- Patch #354133 by NancyDru, AlexisWilke, yoroy: sort disabled blocks by title, not by weight.

1 files changed, 6 insertions, 4 deletions

diff --git a/modules/block/block.admin.inc b/modules/block/block.admin.inc
index 920b0d2c8..a5187b58e 100644
--- a/modules/block/block.admin.inc
+++ b/modules/block/block.admin.inc
@@ -170,10 +170,12 @@ function _block_compare($a, $b) {
   if ((!empty($a['region']) && !empty($b['region'])) && ($place = ($regions[$a['region']] - $regions[$b['region']]))) {
     return $place;
   }
-  // Sort by weight.
-  $weight = $a['weight'] - $b['weight'];
-  if ($weight) {
-    return $weight;
+  // Sort by weight, unless disabled.
+  if ($a['region'] != BLOCK_REGION_NONE) {
+    $weight = $a['weight'] - $b['weight'];
+    if ($weight) {
+      return $weight;
+    }
   }
   // Sort by title.
   return strcmp($a['info'], $b['info']);