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

Merge branch 'MDL-60583' of https://github.com/NeillM/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2020-07-01 09:16:21 +08:00
commit 3585c252ce
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/db/install.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?> <?xml version="1.0" encoding="UTF-8" ?>
<XMLDB PATH="lib/db" VERSION="20200504" COMMENT="XMLDB file for core Moodle tables" <XMLDB PATH="lib/db" VERSION="20200625" COMMENT="XMLDB file for core Moodle tables"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd" xsi:noNamespaceSchemaLocation="../../lib/xmldb/xmldb.xsd"
> >
@ -2795,6 +2795,9 @@
<KEY NAME="contextid" TYPE="foreign" FIELDS="contextid" REFTABLE="context" REFFIELDS="id"/> <KEY NAME="contextid" TYPE="foreign" FIELDS="contextid" REFTABLE="context" REFFIELDS="id"/>
<KEY NAME="creatorid" TYPE="foreign" FIELDS="creatorid" REFTABLE="user" REFFIELDS="id"/> <KEY NAME="creatorid" TYPE="foreign" FIELDS="creatorid" REFTABLE="user" REFFIELDS="id"/>
</KEYS> </KEYS>
<INDEXES>
<INDEX NAME="token" UNIQUE="false" FIELDS="token" COMMENT="This index will be used anytime a token is validated."/>
</INDEXES>
</TABLE> </TABLE>
<TABLE NAME="blog_association" COMMENT="Associations of blog entries with courses and module instances"> <TABLE NAME="blog_association" COMMENT="Associations of blog entries with courses and module instances">
<FIELDS> <FIELDS>

12
lib/db/upgrade.php
View File

@ -2486,5 +2486,17 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2020061500.02); upgrade_main_savepoint(true, 2020061500.02);
} }
if ($oldversion < 2020062600.01) {
// Add index to the token field in the external_tokens table.
$table = new xmldb_table('external_tokens');
$index = new xmldb_index('token', XMLDB_INDEX_NOTUNIQUE, ['token']);
if (!$dbman->index_exists($table, $index)) {
$dbman->add_index($table, $index);
}
upgrade_main_savepoint(true, 2020062600.01);
}
return true; return true;
} }

2
version.php
View File

@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die(); defined('MOODLE_INTERNAL') || die();
$version = 2020062600.00; // YYYYMMDD = weekly release date of this DEV branch. $version = 2020062600.01; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches. // RR = release increments - 00 in DEV branches.
// .XX = incremental changes. // .XX = incremental changes.
$release = '4.0dev (Build: 20200626)'; // Human-friendly version name $release = '4.0dev (Build: 20200626)'; // Human-friendly version name