MDL-36614 fixed version upgrade conflict (git why you no tell me abou…

…t conflict!)
buitranduong · Nov 21, 2012 · 9cae08d · 9cae08d
1 parent 6bf410e
commit 9cae08d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
@@ -1472,20 +1472,6 @@ function xmldb_main_upgrade($oldversion) {
         // Main savepoint reached.
         upgrade_main_savepoint(true, 2012111200.01);
     }
-    if ($oldversion < 2012111601.01) {
-
-        // Define field eventtype to be added to event_subscriptions.
-        $table = new xmldb_table('event_subscriptions');
-        $field = new xmldb_field('eventtype', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, 'userid');
-
-        // Conditionally launch add field eventtype.
-        if (!$dbman->field_exists($table, $field)) {
-            $dbman->add_field($table, $field);
-        }
-
-        // Main savepoint reached.
-        upgrade_main_savepoint(true, 2012111601.01);
-    }
 
     if ($oldversion < 2012111601.01) {
         // Clea up after old shared memory caching support.
@@ -1500,6 +1486,20 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2012111601.01);
     }
 
+    if ($oldversion < 2012112100.00) {
+
+        // Define field eventtype to be added to event_subscriptions.
+        $table = new xmldb_table('event_subscriptions');
+        $field = new xmldb_field('eventtype', XMLDB_TYPE_CHAR, '20', null, XMLDB_NOTNULL, null, null, 'userid');
+
+        // Conditionally launch add field eventtype.
+        if (!$dbman->field_exists($table, $field)) {
+            $dbman->add_field($table, $field);
+        }
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2012112100.00);
+    }
 
     return true;
 }
diff --git a/version.php b/version.php
@@ -30,11 +30,11 @@
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2012111601.01;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012112100.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes
 
-$release  = '2.4beta+ (Build: 20121116)'; // Human-friendly version name
+$release  = '2.4beta+ (Build: 20121121)'; // Human-friendly version name
 
 $branch   = '24';                       // this version's branch
 $maturity = MATURITY_BETA;             // this version's maturity level