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

Merge branch 'MDL-34933_master' of https://github.com/mchurchward/moodle

Browse Source 
Conflicts:
	lib/db/upgrade.php
	version.php
This commit is contained in:
Damyon Wiese 2013-04-23 09:20:05 +08:00
commit b0c4e47499
3 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/db/install.xml
View File

@ -2363,6 +2363,9 @@
<KEYS>
<KEY NAME="primary" TYPE="primary" FIELDS="id" COMMENT="primary key of the table, please edit me"/>
</KEYS>
<INDEXES>
<INDEX NAME="unreadmessageid_idx" UNIQUE="false" FIELDS="unreadmessageid" COMMENT="Index on unreadmessage id"/>
</INDEXES>
</TABLE>
<TABLE NAME="files" COMMENT="description of files, content is stored in sha1 file pool">
<FIELDS>

15
lib/db/upgrade.php
View File

@ -1990,6 +1990,7 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013040300.01);
}
<<<<<<< HEAD
if ($oldversion < 2013041200.00) {
// MDL-29877 Some bad restores created grade items with no category information.
$sql = "UPDATE {grade_items}
@ -2125,5 +2126,19 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2013041900.00);
}
if ($oldversion < 2013042300.00) {
// Adding index to unreadmessageid field of message_working table (MDL-34933)
$table = new xmldb_table('message_working');
$index = new xmldb_index('unreadmessageid_idx', XMLDB_INDEX_NOTUNIQUE, array('unreadmessageid'));
// Conditionally launch add index unreadmessageid
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2013042300.00);
}
return true;
}

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2013042200.00; // YYYYMMDD = weekly release date of this DEV branch
$version = 2013042300.00; // YYYYMMDD = weekly release date of this DEV branch
// RR = release increments - 00 in DEV branches
// .XX = incremental changes