Merge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)
lib/db/upgrade.php
version.php

index b80caa2..fe22691 100644 (file)
@@ -6651,6 +6651,17 @@ FROM
         upgrade_main_savepoint(true, 2011071300.01);
     }
 
+    if ($oldversion < 2011081700.01) {
+        // Remove category_sortorder index that was supposed to be removed long time ago
+        $table = new xmldb_table('course');
+        $index = new xmldb_index('category_sortorder', XMLDB_INDEX_UNIQUE, array('category', 'sortorder'));
+
+        if ($dbman->index_exists($table, $index)) {
+            $dbman->drop_index($table, $index);
+        }
+        upgrade_main_savepoint(true, 2011081700.01);
+    }
+
 
     return true;
 }
index f211fd4..1b2578a 100644 (file)
@@ -31,7 +31,7 @@ defined('MOODLE_INTERNAL') || die();
 
 
 
-$version  = 2011081700.00;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2011081700.01;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes