Commit c36575dd authored by Aaron Wells's avatar Aaron Wells
Browse files

Revert "Upgrade the blocktype.text after adding 'shortcut' category"

This reverts commit f247b267.

Bug 1438475: Thanks to commit edaf831d, we no longer need to wait until
after creating the blocktype sortorder column before we install
blocktype.text.

Moving it back to its original location avoids the awkward "Nothing to
update" message seen when upgrading from 1.9 -> 15.04

Change-Id: I78c290d6d69f285fc172f76a2433546b0f7b2cb1
parent e92df62c
...@@ -3548,6 +3548,12 @@ function xmldb_core_upgrade($oldversion=0) { ...@@ -3548,6 +3548,12 @@ function xmldb_core_upgrade($oldversion=0) {
AND NOT EXISTS (SELECT 1 FROM {institution} i WHERE i.name = {usr_registration}.institution)'); AND NOT EXISTS (SELECT 1 FROM {institution} i WHERE i.name = {usr_registration}.institution)');
} }
if ($oldversion < 2014081900) {
if ($data = check_upgrades('blocktype.text')) {
upgrade_plugin($data);
}
}
if ($oldversion < 2014091600) { if ($oldversion < 2014091600) {
$table = new XMLDBTable('view'); $table = new XMLDBTable('view');
$field = new XMLDBField('anonymise'); $field = new XMLDBField('anonymise');
...@@ -3848,10 +3854,6 @@ function xmldb_core_upgrade($oldversion=0) { ...@@ -3848,10 +3854,6 @@ function xmldb_core_upgrade($oldversion=0) {
$todb->name = 'shortcut'; $todb->name = 'shortcut';
$todb->sort = '0'; $todb->sort = '0';
insert_record('blocktype_category', $todb); insert_record('blocktype_category', $todb);
if ($data = check_upgrades('blocktype.text')) {
upgrade_plugin($data);
}
} }
if ($oldversion < 2014112700) { if ($oldversion < 2014112700) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment