Fixed a bug: blocks without db functions caused the upgrade process to become stuck.

diff --git a/lib/blocklib.php b/lib/blocklib.php
index 637e7f51b3ab3d9132386034d966169abaa71b52..6610c9c9d84c3c09eb3c300fa890666b0b5fcfd3 100644 (file)
--- a/lib/blocklib.php
+++ b/lib/blocklib.php
@@ -496,23 +496,32 @@ function upgrade_blocks_plugins($continueto) {
                     $strblocksetup    = get_string("blocksetup");
                     print_header($strblocksetup, $strblocksetup, $strblocksetup, "", "", false, " ", " ");
                 }
-                print_heading("$block->name block needs upgrading");
-                $upgrade_function = $block->name."_upgrade";
+                print_heading('New version of '.$blocktitle.' ('.$block->name.') exists');
+                $upgrade_function = $block->name.'_upgrade';
                 if (function_exists($upgrade_function)) {
                     $db->debug=true;
                     if ($upgrade_function($currblock->version, $block)) {
-                        $db->debug=false;
-                        // OK so far, now update the blocks record
-                        $block->id = $currblock->id;
-                        if (! update_record("blocks", $block)) {
-                            error("Could not update block $block->name record in blocks table!");
-                        }
-                        notify(get_string('blocksuccess', '', $blocktitle), 'green');
-                        echo "<HR>";
+
+                        $upgradesuccess = true;
                     } else {
-                        $db->debug=false;
-                        notify("Upgrading block $block->name from $currblock->version to $block->version FAILED!");
+                        $upgradesuccess = false;
                     }
+                    $db->debug=false;
+                }
+                else {
+                    $upgradesuccess = true;
+                }
+                if(!$upgradesuccess) {
+                    notify("Upgrading block $block->name from $currblock->version to $block->version FAILED!");
+                }
+                else {
+                    // OK so far, now update the blocks record
+                    $block->id = $currblock->id;
+                    if (! update_record('blocks', $block)) {
+                        error("Could not update block $block->name record in blocks table!");
+                    }
+                    notify(get_string('blocksuccess', '', $blocktitle), 'green');
+                    echo '<hr />';
                 }
                 $updated_blocks = true;
             } else {