From: skodak <skodak>
Date: Mon, 10 Mar 2008 10:46:42 +0000 (+0000)
Subject: MDL-13866   scale ratings do not work in forum; merged from MOODLE_19_STABLE
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=b30f2e92ba2e32a3ca44f602babc75f236abd9dc;p=moodle.git

MDL-13866   scale ratings do not work in forum; merged from MOODLE_19_STABLE
---

diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index 199e53cfa5..bce988f1e9 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -32,14 +32,6 @@ function xmldb_forum_upgrade($oldversion=0) {
 ///     $result = result of "/lib/ddllib.php" function calls
 /// }
 
-    if ($result && $oldversion < 2007072200) {
-        require_once($CFG->dirroot.'/mod/forum/lib.php');
-        // too much debug output
-        $db->debug = false;
-        forum_update_grades();
-        $db->debug = true;
-    }  
-
     if ($result && $oldversion < 2007101000) {
 
     /// Define field timemodified to be added to forum_queue
@@ -51,6 +43,14 @@ function xmldb_forum_upgrade($oldversion=0) {
         $result = $result && add_field($table, $field);
     }
 
+    if ($result and $oldversion < 2007101510) {
+        //MDL-13866 - send forum ratins to gradebook again
+        require_once($CFG->dirroot.'/mod/forum/lib.php');
+        // too much debug output
+        $db->debug = false;
+        forum_update_grades();
+        $db->debug = true;
+    }
 
     return $result;
 }
diff --git a/mod/forum/version.php b/mod/forum/version.php
index 5b5ec1d424..c4507d5ccf 100644
--- a/mod/forum/version.php
+++ b/mod/forum/version.php
@@ -5,7 +5,7 @@
 //  This fragment is called by /admin/index.php
 ////////////////////////////////////////////////////////////////////////////////
 
-$module->version  = 2007101509;
+$module->version  = 2007101510;
 $module->requires = 2007101509;  // Requires this Moodle version
 $module->cron     = 60;