blocks upgrade: MDL-20820 Problem found and fixed by Oleg Sychev.

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 4de98a3b1fac2747cd6020108978a08b4e7cb3e5..d281ce0760ef9bf7ceb5cd8a4418b9864f1eff90 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2030,7 +2030,7 @@ WHERE gradeitemid IS NOT NULL AND grademax IS NOT NULL");
         $stickyblocks = $DB->get_recordset('block_pinned_old');
         foreach ($stickyblocks as $stickyblock) {
             $newblock = new object();
-            $newblock->blockname = $blocks[$stickyblock]->name;
+            $newblock->blockname = $blocks[$stickyblock->blockid]->name;
             $newblock->contextid = $syscontext->id;
             $newblock->showinsubcontexts = 1;
             switch ($stickyblock->pagetype) {