From: scyrma <scyrma>
Date: Tue, 29 Jan 2008 05:54:42 +0000 (+0000)
Subject: Upgrade path for MDL-13060. (merge from 19_STABLE)
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d4d71354441023af88ed3754fba3384490d798e7;p=moodle.git

Upgrade path for MDL-13060. (merge from 19_STABLE)
---

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index a8c3e1acd5..39487426a2 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2679,6 +2679,21 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101507);
     }
 
+    if ($result && $oldversion < 2007101508) {
+        $db->debug = false;
+        notify('Updating country list according to recent official ISO listing...', 'notifysuccess');
+        // re-assign users to valid countries
+        set_field('user', 'country', 'CD', 'country', 'ZR'); // Zaire is now Congo Democratique
+        set_field('user', 'country', 'TL', 'country', 'TP'); // Timor has changed
+        set_field('user', 'country', 'FR', 'country', 'FX'); // France metropolitaine doesn't exist
+        set_field('user', 'country', 'RS', 'country', 'KO'); // Kosovo is part of Serbia, "under the auspices of the United Nations, pursuant to UN Security Council Resolution 1244 of 10 June 1999."
+        set_field('user', 'country', 'GB', 'country', 'WA'); // Wales is part of UK (ie Great Britain)
+        set_field('user', 'country', 'RS', 'country', 'CS'); // Re-assign Serbia-Montenegro to Serbia.  This is arbitrary, but there is no way to make an automatic decision on this.
+        notify('...update complete. Remember to update the language pack to get the most recent country names defitions and codes.  This is specialy important for sites with users from Congo (now CD), Timor (now TL), Kosovo (now RS), Wales (now GB), Serbia (RS) and Montenegro (ME).  Users based in Montenegro (ME) will need to manually update their profile.', 'notifysuccess');
+        $db->debug = true;
+        upgrade_main_savepoint($result, 2007101508);
+    }
+
 
     return $result;
 }
diff --git a/version.php b/version.php
index 221879a655..93d228d903 100644
--- 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 = 2007101507;  // YYYYMMDD = date
+    $version = 2007101508;  // YYYYMMDD = date
                             //       XY = increments within a single day
 
     $release = '2.0 dev';   // Human-friendly version name