mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-27 03:14:20 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-55990-master' of git://github.com/marinaglancy/moodle

Browse Source
This commit is contained in:
David Monllao 2016-10-03 13:00:08 +08:00
commit 7b7ddd97b9
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/db/upgrade.php
View File

@ -1149,15 +1149,6 @@ function xmldb_main_upgrade($oldversion) {
// Launch add key tagcloudid.
$dbman->add_key($table, $key);
// Define index tagcolltype (not unique) to be added to tag.
$table = new xmldb_table('tag');
$index = new xmldb_index('tagcolltype', XMLDB_INDEX_NOTUNIQUE, array('tagcollid', 'tagtype'));
// Conditionally launch add index tagcolltype.
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2016011300.02);
}
@ -1327,6 +1318,7 @@ function xmldb_main_upgrade($oldversion) {
}
// Define index tagcolltype (not unique) to be dropped form tag.
// This index is no longer created however it was present at some point and it's better to be safe and try to drop it.
$index = new xmldb_index('tagcolltype', XMLDB_INDEX_NOTUNIQUE, array('tagcollid', 'tagtype'));
// Conditionally launch drop index tagcolltype.