Set the user->lang DB default to en_utf8. MDL-16845 ; merged from 19_STABLE

diff --git a/lib/db/install.xml b/lib/db/install.xml
index 81e28831a6d9b3530a975513fff709b2972e9181..6cd878eecad554f78268afc1879bd7a69b9f8b4c 100644 (file)
--- a/lib/db/install.xml
+++ b/lib/db/install.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<XMLDB PATH="lib/db" VERSION="20080916" COMMENT="XMLDB file for core Moodle tables"
+<XMLDB PATH="lib/db" VERSION="20081010" COMMENT="XMLDB file for core Moodle tables"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
 >
@@ -469,7 +469,7 @@
         <FIELD NAME="address" TYPE="char" LENGTH="70" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="department" NEXT="city"/>
         <FIELD NAME="city" TYPE="char" LENGTH="20" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="address" NEXT="country"/>
         <FIELD NAME="country" TYPE="char" LENGTH="2" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="city" NEXT="lang"/>
-        <FIELD NAME="lang" TYPE="char" LENGTH="30" NOTNULL="true" DEFAULT="en" SEQUENCE="false" ENUM="false" PREVIOUS="country" NEXT="theme"/>
+        <FIELD NAME="lang" TYPE="char" LENGTH="30" NOTNULL="true" DEFAULT="en_utf8" SEQUENCE="false" ENUM="false" PREVIOUS="country" NEXT="theme"/>
         <FIELD NAME="theme" TYPE="char" LENGTH="50" NOTNULL="true" SEQUENCE="false" ENUM="false" PREVIOUS="lang" NEXT="timezone"/>
         <FIELD NAME="timezone" TYPE="char" LENGTH="100" NOTNULL="true" DEFAULT="99" SEQUENCE="false" ENUM="false" PREVIOUS="theme" NEXT="firstaccess"/>
         <FIELD NAME="firstaccess" TYPE="int" LENGTH="10" NOTNULL="true" UNSIGNED="true" DEFAULT="0" SEQUENCE="false" ENUM="false" PREVIOUS="timezone" NEXT="lastaccess"/>

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 8b70e7580d69026fe5d01f0e6aa2ee9fb5fdc7a3..b79ad6d58acb5e057ec579e5f97016578eb3aacd 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -849,6 +849,19 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint($result, 2008092300);
     }
 
+    if ($result && $oldversion < 2008101000) {
+
+    /// Changing the default of field lang on table user to en_utf8
+        $table = new xmldb_table('user');
+        $field = new xmldb_field('lang', XMLDB_TYPE_CHAR, '30', null, XMLDB_NOTNULL, null, null, null, 'en_utf8', 'country');
+
+    /// Launch change of default for field lang
+        $dbman->change_field_default($table, $field);
+
+    /// Main savepoint reached
+        upgrade_main_savepoint($result, 2008101000);
+    }
+
 
     return $result;
 }

diff --git a/version.php b/version.php
index c76fd13e3e57a627e60ec9c5805270e0492d4124..3f43887ffa97ce33b5513d309d9ef0483409cdf3 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 = 2008100801;  // YYYYMMDD   = date of the last version bump
+    $version = 2008101000;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20081010)';  // Human-friendly version name