Merge branch '43714-26' of git://github.com/samhemelryk/moodle into MOODLE_26_STABLE

2014-01-21 14:49:27 +08:00
parent 1cbda6fabd 9b93e7b472
commit 0469922b5f
1 changed files with 8 additions and 3 deletions
@@ -88,9 +88,14 @@ switch ($action) {

        $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;