Fixing up any references to obsolete language pack ma_nt

diff --git a/lib/db/mysql.php b/lib/db/mysql.php
index aa0f63aea76a4f5f0380f4719a2e648a183c32fd..bf77ddd39f37027cd3bca288530df65314806a6e 100644 (file)
--- a/lib/db/mysql.php
+++ b/lib/db/mysql.php
@@ -874,6 +874,11 @@ function main_upgrade($oldversion=0) {
                       ) TYPE=MyISAM COMMENT='Optional database session storage, not used by default';");
     }
 
+    if ($oldversion < 2004111500) {  // Update any users/courses using wrongly-named lang pack
+        execute_sql("UPDATE {$CFG->prefix}user SET lang = 'mi_nt' WHERE lang = 'ma_nt'");
+        execute_sql("UPDATE {$CFG->prefix}course SET lang = 'mi_nt' WHERE lang = 'ma_nt'");
+    }
+
     return $result;
 
 }

diff --git a/lib/db/postgres7.php b/lib/db/postgres7.php
index 4a7afde154bc7c0d417e069953e052d08021ec98..ca6dc516ca4a4da6a557d93c2a6ed695bdaa3096 100644 (file)
--- a/lib/db/postgres7.php
+++ b/lib/db/postgres7.php
@@ -612,6 +612,11 @@ function main_upgrade($oldversion=0) {
 
         execute_sql(" CREATE INDEX {$CFG->prefix}sessions_expiry_idx ON {$CFG->prefix}sessions (expiry)");
     }
+
+    if ($oldversion < 2004111500) {  // Update any users/courses using wrongly-named lang pack
+        execute_sql("UPDATE {$CFG->prefix}user SET lang = 'mi_nt' WHERE lang = 'ma_nt'");
+        execute_sql("UPDATE {$CFG->prefix}course SET lang = 'mi_nt' WHERE lang = 'ma_nt'");
+    }
     
     return $result;
 

diff --git a/version.php b/version.php
index 0360d2cbf271f1efae301d75541a9463830482bc..0cb0cff764402579b507b519ec484881ac4508c4 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 = 2004111200;  // YYYYMMDD = date of first major branch release 1.4
+   $version = 2004111500;  // YYYYMMDD = date of first major branch release 1.4
                            //       XY = increments within a single day
 
    $release = '1.5 UNSTABLE DEVELOPMENT';    // Human-friendly version name