MDL-19350 upgrade blocks - fixing minor bits in modules

diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php
index 391647241e61bd23475d9c67b97e4897492f9684..9666dc7c92fc2613900049381bbd2d220e9131ee 100644 (file)
--- a/mod/chat/db/upgrade.php
+++ b/mod/chat/db/upgrade.php
@@ -83,7 +83,7 @@ function xmldb_chat_upgrade($oldversion) {
     /// chat savepoint reached
         upgrade_mod_savepoint($result, 2009042000, 'chat');
     }
-    
+
     return $result;
 }
 

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index a7555b2512748a64c0291924d82a07b8f0b668d4..325740bdc4f55fae5347e679fcd22bf6cfc240f2 100644 (file)
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -28,7 +28,7 @@ function xmldb_forum_upgrade($oldversion) {
 
 //===== 1.9.0 upgrade line ======//
 
-    if ($result and $oldversion < 2007101511) {
+    if ($result && $oldversion < 2007101511) {
         //MDL-13866 - send forum ratins to gradebook again
         require_once($CFG->dirroot.'/mod/forum/lib.php');
         forum_upgrade_grades();

diff --git a/mod/hotpot/db/upgrade.php b/mod/hotpot/db/upgrade.php
index dd990d9e3ab741f5e7028458620077709ec8b922..1fdd36f5cda4b50153476a943ecbd5d00c090e3a 100644 (file)
--- a/mod/hotpot/db/upgrade.php
+++ b/mod/hotpot/db/upgrade.php
@@ -18,13 +18,13 @@ function xmldb_hotpot_upgrade($oldversion) {
         // ensure "hotpot_upgrade_grades" function is available
         require_once $CFG->dirroot.'/mod/hotpot/lib.php';
         hotpot_upgrade_grades();
-        upgrade_mod_savepoint(true, 2007101511, 'hotpot');
+        upgrade_mod_savepoint($result, 2007101511, 'hotpot');
     }
 
     if ($result && $oldversion < 2008011200) {
         // remove not used setting
         unset_config('hotpot_initialdisable');
-        upgrade_mod_savepoint(true, 2008011200, 'hotpot');
+        upgrade_mod_savepoint($result, 2008011200, 'hotpot');
     }
 
     return $result;

diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index e3aa01889fa7a0a9dd27eaf97ebf18d4c3d33f45..92175455684a433e3e5feefb1f9714b7a005b0b1 100644 (file)
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -28,7 +28,7 @@ function xmldb_label_upgrade($oldversion) {
 
 //===== 1.9.0 upgrade line ======//
 
-    if ($oldversion < 2007101510) {
+    if ($result && $oldversion < 2007101510) {
         $sql = "UPDATE {log_display} SET mtable = 'label' WHERE module = 'label'";
         $result = $DB->execute($sql);
         upgrade_mod_savepoint($result, 2007101510, 'label');