Commit 03c65555 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

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

parents 6c247959 c36575dd
...@@ -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