Fixed database upgrade so that forum->scale is created before the

get_scale_menu tries to use it.

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 6110873b11e6b30b1bdec4b3b38e79bcc4e867f2..4e3ddf65f3c656787f5b15c4c3a2f60671556eea 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -473,10 +473,11 @@ function main_upgrade($oldversion=0) {
                          `timemodified` int(10) unsigned NOT NULL default '0',
                          PRIMARY KEY  (id)
                        ) TYPE=MyISAM COMMENT='Defines grading scales'");
-    }
 
+    }
 
     if ($oldversion < 2003081503) {
+        table_column("forum", "", "scale", "integer", "10", "unsigned", "0", "", "assessed");
         get_scales_menu(0);    // Just to force the default scale to be created
     }
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 8c02ab7ca6e4d6a050111aabfd4a0983e9d432d4..44f4f016548a1b64c9c0e6b55084fc3836916527 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -221,6 +221,7 @@ function main_upgrade($oldversion=0) {
     }
 
     if ($oldversion < 2003081503) {
+        table_column("forum", "", "scale", "integer", "10", "unsigned", "0", "", "assessed");
         get_scales_menu(0);    // Just to force the default scale to be created
     }
 

diff --git a/mod/forum/db/mysql.php b/mod/forum/db/mysql.php
index 4f8655093e786ff5772e623452252bcfb8bcbcbe..bb7a3186e90c2b63e9e1f43399c807d07bbc8fd9 100644 (file)
--- a/mod/forum/db/mysql.php
+++ b/mod/forum/db/mysql.php
@@ -62,13 +62,8 @@ function forum_upgrade($oldversion) {
       execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
   }
 
-  if ($oldversion < 2003081300) {
-      table_column("forum", "assessed", "assessed", "integer", "10", "unsigned", "0");
-      table_column("forum", "", "scale", "integer", "10", "unsigned", "0", "", "assessed");
-  }
-
   if ($oldversion < 2003081403) {
-      get_scales_menu();   /// This function will create a new default scale
+      table_column("forum", "assessed", "assessed", "integer", "10", "unsigned", "0");
   }
   
   return true;

diff --git a/mod/forum/db/postgres7.php b/mod/forum/db/postgres7.php
index 87546f205ed40bfef26422ca02373675352e3006..997ec5dbb642a74b4e4289a5ae7ea33ee63ed31d 100644 (file)
--- a/mod/forum/db/postgres7.php
+++ b/mod/forum/db/postgres7.php
@@ -10,9 +10,6 @@ function forum_upgrade($oldversion) {
       execute_sql("INSERT INTO {$CFG->prefix}log_display VALUES ('forum', 'move discussion', 'forum_discussions', 'name')");
   }
 
-  if ($oldversion < 2003081300) {
-      table_column("forum", "", "scale", "integer", "10", "unsigned", "0", "", "assessed");
-  }
 
   return true;