Following the fixes for MDL-14750 and MDL-10899, do a database upgrade that fixes...

diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index 7156a8744bb2c3e09f1458d49f3875b15c3f44ba..60238976dbb81de5dddf6f37773aa45a93d2d888 100644 (file)
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -32,7 +32,34 @@ function xmldb_qtype_multianswer_upgrade($oldversion=0) {
 ///     $result = result of "/lib/ddllib.php" function calls
 /// }
 
+    if ($result && $oldversion < 2008050800) {
+        question_multianswer_fix_subquestion_parents_and_categories();
+    }
+
     return $result;
 }
 
+/**
+ * Due to MDL-14750, subquestions of multianswer questions restored from backup will
+ * have the wrong parent, and due to MDL-10899 subquestions of multianswer questions
+ * that have been moved between categories will be in the wrong category, This code fixes these up.
+ */
+function question_multianswer_fix_subquestion_parents_and_categories() {
+    global $CFG;
+
+    $result = true;
+    $rs = get_recordset_sql('SELECT q.id, q.category, qma.sequence FROM ' . $CFG->prefix .
+            'question q JOIN ' . $CFG->prefix . 'question_multianswer qma ON q.id = qma.question');
+    if ($rs) {
+        while ($q = rs_fetch_next_record($rs)) {
+            $result = $result && execute_sql('UPDATE ' . $CFG->prefix . 'question' .
+                       ' SET parent = ' . $q->id . ', category = ' . $q->category .
+                       ' WHERE id IN (' . $q->sequence . ') AND parent <> 0');
+        }
+        rs_close($rs);
+    } else {
+        $result = false;
+    }
+    return $result;
+}
 ?>

diff --git a/question/type/multianswer/version.php b/question/type/multianswer/version.php
index c39730578d9b771d0b380eb833b7afe30d4b030c..6d0f10af814912d2c127897db51c7a890de9cac0 100644 (file)
--- a/question/type/multianswer/version.php
+++ b/question/type/multianswer/version.php
@@ -1,6 +1,6 @@
 <?PHP // $Id$
 
-$plugin->version  = 2006032200;
-$plugin->requires = 2007101000;
+$plugin->version  = 2008050800;
+$plugin->requires = 2007101509;
 
 ?>