From: tjhunt <tjhunt>
Date: Sat, 13 Oct 2007 22:00:55 +0000 (+0000)
Subject: Correct misleading error message in upgrade_activity_modules. Spotted while diagnosin... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=8bc9ebc4018698d4c3ff9234ca0e9605aa81078f;p=moodle.git

Correct misleading error message in upgrade_activity_modules. Spotted while diagnosing MDL-11732. Merged from MOODLE_19_STABLE.
---

diff --git a/lib/adminlib.php b/lib/adminlib.php
index 789732a78f..46af0f5b45 100644
--- a/lib/adminlib.php
+++ b/lib/adminlib.php
@@ -322,6 +322,10 @@ function upgrade_activity_modules($return) {
                 if ($oldupgrade && function_exists($oldupgrade_function)) {
                     $db->debug = true;
                     $oldupgrade_status = $oldupgrade_function($currmodule->version, $module);
+                    if (!$oldupgrade_status) {
+                        notify ('Upgrade function ' . $oldupgrade_function .
+                                ' did not complete successfully.'); 
+                    }
                 } else if ($oldupgrade) {
                     notify ('Upgrade function ' . $oldupgrade_function . ' was not available in ' .
                              $mod . ': ' . $fullmod . '/db/' . $CFG->dbtype . '.php');
@@ -332,7 +336,7 @@ function upgrade_activity_modules($return) {
                 if ($newupgrade && function_exists($newupgrade_function) && $oldupgrade_status) {
                     $db->debug = true;
                     $newupgrade_status = $newupgrade_function($currmodule->version, $module);
-                } else if ($newupgrade) {
+                } else if ($newupgrade && $oldupgrade_status) {
                     notify ('Upgrade function ' . $newupgrade_function . ' was not available in ' .
                              $mod . ': ' . $fullmod . '/db/upgrade.php');
                 }