L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip-MDL-60167-32' of git://github.com/marinaglancy/moodle into MOODLE_32_STABLE

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2017-09-25 20:19:50 +02:00
parent 469c46aa3a 930ef87ff8
commit 0c95cbef53
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/db/upgrade.php
+20 -1
View File
@@ -2576,7 +2576,12 @@ function xmldb_main_upgrade($oldversion) {
['hub', '%' . $DB->sql_like_escape('_' . $cleanoldhuburl)]);
foreach ($entries as $entry) {
$newname = substr($entry->name, 0, -strlen($cleanoldhuburl)) . $cleannewhuburl;
$DB->update_record('config_plugins', ['id' => $entry->id, 'name' => $newname]);
try {
$DB->update_record('config_plugins', ['id' => $entry->id, 'name' => $newname]);
} catch (dml_exception $e) {
// Entry with new name already exists, remove the one with an old name.
$DB->delete_records('config_plugins', ['id' => $entry->id]);
}
}
// Update published courses.
@@ -2612,5 +2617,19 @@ function xmldb_main_upgrade($oldversion) {
upgrade_main_savepoint(true, 2016120505.01);
}
if ($oldversion < 2016120505.04) {
// Remove duplicate registrations.
$newhuburl = "https://moodle.net";
$registrations = $DB->get_records('registration_hubs', ['huburl' => $newhuburl], 'confirmed DESC, id ASC');
if (count($registrations) > 1) {
$reg = array_shift($registrations);
$DB->delete_records_select('registration_hubs', 'huburl = ? AND id <> ?', [$newhuburl, $reg->id]);
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2016120505.04);
}
return true;
}
version.php
+1 -1
View File
@@ -29,7 +29,7 @@
defined('MOODLE_INTERNAL') || die();
$version = 2016120505.03; // YYYYMMDD = weekly release date of this DEV branch.
$version = 2016120505.04; // YYYYMMDD = weekly release date of this DEV branch.
// RR = release increments - 00 in DEV branches.
// .XX = incremental changes.