Merge branch '43714-25' of git://github.com/samhemelryk/moodle into M…

…OODLE_25_STABLE
moodle · Jan 21, 2014 · 4bdaa6a · 4bdaa6a
2 parents 9102d4e + 70c4647
commit 4bdaa6a
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/lib/ajax/blocks.php b/lib/ajax/blocks.php
@@ -88,9 +88,14 @@
 
         $bui_newweight = null;
         if ($bui_beforeid == 0) {
-            // Moving to very bottom
-            $last = end($instances);
-            $bui_newweight = $last->instance->weight + 1;
+            if (count($instances) === 0) {
+                // Moving the block into an empty region. Give it the default weight.
+                $bui_newweight = 0;
+            } else {
+                // Moving to very bottom.
+                $last = end($instances);
+                $bui_newweight = $last->instance->weight + 1;
+            }
         } else {
             // Moving somewhere
             $lastweight = 0;