Merged from MOODLE_14_HEAD - Better behaviour of fix_course_sortorder() -- related...

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index 1ffc24ba658555946951e30db764d849ec519848..da7a30a046f899248a1667db13e107128bd5ccc8 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -1142,6 +1142,10 @@ function main_upgrade($oldversion=0) {
         table_column('course_meta','id','id','integer','10','','0','not null');
     }
 
+    if ($oldversion < 2005020100) {
+        fix_course_sortorder(0, 1, 1);
+    }   
+
     return $result;
 }
 

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index b368d8de0b65c79ba8db2e7119f47d50e0760f8d..e01ace42da3a2803b9b481760b4366a762a8cffe 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -907,6 +907,10 @@ function main_upgrade($oldversion=0) {
         table_column('course','','metacourse','integer','1','','0','not null');
     }
 
+    if ($oldversion < 2005020100) {
+        fix_course_sortorder(0, 1, 1);
+    } 
+
     return $result;
 }
 

diff --git a/version.php b/version.php
index fe2b37e7ac6c7f63393a4009cce181bd10511e87..b85ed65cb61c1b7d3b73a62f68a8ecce9b13bb76 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine 
 // whether upgrades should be performed (see lib/db/*.php)
 
-   $version = 2005012800;  // YYYYMMDD = date of first major branch release 1.4
+   $version = 2005020100;  // YYYYMMDD = date of first major branch release 1.4
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name