From: pichetp <pichetp>
Date: Fri, 9 Oct 2009 18:40:16 +0000 (+0000)
Subject: MDL-20522 the $result was forgotten in the last test if ($result && $oldversion ... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=188c3eaa8056db773394cc50d5d2db1a0c1bdb5b;p=moodle.git

MDL-20522 the $result was forgotten in the last test if ($result && $oldversion < 2009092000)
---

diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index 94076f77e4..521693c289 100644
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -58,7 +58,7 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
         }
         upgrade_plugin_savepoint($result, 2009082000 , 'qtype', 'calculated');
     }
-    if ( $oldversion < 2009092000 ) { //New version in version.php
+    if ( $result && $oldversion < 2009092000 ) { //New version in version.php
 
     /// Define field multichoice to be added to question_calculated_options
         $table = new xmldb_table('question_calculated_options');