Remove 'regrade' report from the quiz_report table, since it no longer exists.

diff --git a/mod/quiz/db/install.xml b/mod/quiz/db/install.xml
index e81b4825defb81a10ad882d33b3acc29cdb7bd1c..b40eab101b284ab0a16974b70eca9beb54273a93 100755 (executable)
--- a/mod/quiz/db/install.xml
+++ b/mod/quiz/db/install.xml
@@ -328,7 +328,6 @@
         <SENTENCE TEXT="(name, displayorder) VALUES ('overview', '10000')" />
         <SENTENCE TEXT="(name, displayorder) VALUES ('responses', '9000')" />
         <SENTENCE TEXT="(name, displayorder) VALUES ('statistics', '8000')" />
-        <SENTENCE TEXT="(name, displayorder) VALUES ('regrade', '7000')" />
         <SENTENCE TEXT="(name, displayorder) VALUES ('grading', '6000')" />
       </SENTENCES>
     </STATEMENT>

diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index a0ca4967a50e7b7c3e8dcccfba7fffdcccc7fc17..ade5e3e2108dac75877383566d09c7a90d7f217a 100644 (file)
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -109,6 +109,13 @@ function xmldb_quiz_upgrade($oldversion=0) {
         upgrade_mod_savepoint($result, 2008072402, 'quiz');
     }
 
+    if ($result && $oldversion < 2008072900) {
+    /// Delete the regrade report - it is now part of the overview report.
+        $result = $result && $DB->delete_records('quiz_report', array('name' => 'regrade'));
+
+    /// quiz savepoint reached
+        upgrade_mod_savepoint($result, 2008072900, 'quiz');
+    }
 
     return $result;
 }

diff --git a/mod/quiz/version.php b/mod/quiz/version.php
index 676568c21efdd1e0c289aec0ebba17fe94b78b60..07f646d12437b63db8c344a139fc88ab57f37c16 100644 (file)
--- a/mod/quiz/version.php
+++ b/mod/quiz/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by moodle_needs_upgrading() and /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2008072402;   // The (date) version of this module
+$module->version  = 2008072900;   // The (date) version of this module
 $module->requires = 2008072401;   // Requires this Moodle version
 $module->cron     = 0;            // How often should cron check this module (seconds)?