mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-32543' of https://github.com/danielneis/moodle

Browse Source 
Conflicts:
	version.php
This commit is contained in:
Damyon Wiese 2014-05-19 13:02:48 +08:00
commit fc6b66c913
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/db/upgrade.php
View File

@ -3612,6 +3612,7 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2014041500.01);
}
if ($oldversion < 2014050100.00) {
// Fixing possible wrong MIME type for DigiDoc files.
$extensions = array('%.bdoc', '%.cdoc', '%.ddoc');
@ -3628,5 +3629,34 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2014050100.00);
}
// MDL-32543 Make sure that the log table has correct length for action and url fields.
if ($oldversion < 2014051200.01) {
$table = new xmldb_table('log');
$columns = $DB->get_columns('log');
if ($columns['action']->max_length < 40) {
$index1 = new xmldb_index('course-module-action', XMLDB_INDEX_NOTUNIQUE, array('course', 'module', 'action'));
if ($dbman->index_exists($table, $index1)) {
$dbman->drop_index($table, $index1);
}
$index2 = new xmldb_index('action', XMLDB_INDEX_NOTUNIQUE, array('action'));
if ($dbman->index_exists($table, $index2)) {
$dbman->drop_index($table, $index2);
}
$field = new xmldb_field('action', XMLDB_TYPE_CHAR, '40', null, XMLDB_NOTNULL, null, null, 'cmid');
$dbman->change_field_precision($table, $field);
$dbman->add_index($table, $index1);
$dbman->add_index($table, $index2);
}
if ($columns['url']->max_length < 100) {
$field = new xmldb_field('url', XMLDB_TYPE_CHAR, '100', null, XMLDB_NOTNULL, null, null, 'action');
$dbman->change_field_precision($table, $field);
}
upgrade_main_savepoint(true, 2014051200.01);
}
return true;
}