MDL-13553 - merge from 1.9

diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index 556e64396ee2b812e6c83caf6eb3684f583b3ad5..30e1167a4d684d6cc26cb6df6e99813941593afc 100644 (file)
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -2852,6 +2852,10 @@ function xmldb_main_upgrade($oldversion=0) {
         upgrade_main_savepoint($result, 2007101508.03);
     }
 
+    if ($result && $oldversion < 2007101508.04) {
+        set_field('tag_instance', 'itemtype', 'post', 'itemtype', 'blog'); 
+        upgrade_main_savepoint($result, 2007101508.04);
+    }
 
     return $result;
 }

diff --git a/version.php b/version.php
index dec4174b40abfe2a3464fcf85251a081a9886227..79bdf90bccc8f6eef84e6f551418a2394cc0bb9f 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,8 +6,9 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2007101508.03;  // YYYYMMDD = date
-                            //       XY = increments within a single day
+    $version = 2007101508.04;  // YYYYMMDD   = date of the 1.9 branch (don't change)
+                            //         X  = release number 1.9.[0,1,2,3...]
+                            //          Y = micro-increments between releases
 
     $release = '2.0 dev';   // Human-friendly version name