MDL-20522 the $result was forgotten in the last test if ($result && $oldversion ...

diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index 94076f77e458073089aae688e5175327e9ddb038..521693c289dbdcab0e0a608a0d9e80a5882eb18a 100644 (file)
--- 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');