mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-02-19 23:55:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-83691-main' of https://github.com/meirzamoodle/moodle

Browse Source
This commit is contained in:
Jun Pataleta 2024-12-18 13:46:38 +08:00
commit e33b058910
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/db/upgrade.php
View File

@ -1321,5 +1321,25 @@ function xmldb_main_upgrade($oldversion) {
// Main savepoint reached.
upgrade_main_savepoint(true, 2024120500.02);
}
if ($oldversion < 2024121800.00) {
$smsgateways = $DB->get_records('sms_gateways');
foreach ($smsgateways as $gateway) {
$newconfig = json_decode($gateway->config);
// Continue only if either the `returnurl` OR the `saveandreturn` property exists.
if (property_exists($newconfig, "returnurl") || property_exists($newconfig, "saveandreturn")) {
// Remove unnecessary data in the config.
unset($newconfig->returnurl, $newconfig->saveandreturn);
// Update the record with the new config.
$gateway->config = json_encode($newconfig);
$DB->update_record('sms_gateways', $gateway);
}
}
// Main savepoint reached.
upgrade_main_savepoint(true, 2024121800.00);
}
return true;
}

3
sms/configure.php
View File

@ -96,7 +96,8 @@ if ($data = $mform->get_data()) {
$manager = \core\di::get(\core_sms\manager::class);
$smsgateway = $data->smsgateway;
$gatewayname = $data->name;
unset($data->smsgateway, $data->name, $data->id);
// The $data will go into the database config column. If any data is not needed, unset it here.
unset($data->smsgateway, $data->name, $data->id, $data->saveandreturn, $data->returnurl);
if (!empty($id)) {
$gatewayinstance = $manager->get_gateway_instances(['id' => $id]);
$gatewayinstance = reset($gatewayinstance);

2
version.php
View File

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