Merge branch 'm40_MDL-70042_Progress_Bar_Upgrade_Message_Popup' of https://github.com/scara/moodle

This commit is contained in:
Adrian Greeve 2020-10-29 08:34:27 +08:00
commit 131dacceb5

View file

@ -51,6 +51,7 @@ function xmldb_message_popup_upgrade($oldversion) {
ON mpn.notificationid = n.id ON mpn.notificationid = n.id
WHERE n.id IS NULL"; WHERE n.id IS NULL";
$total = $DB->count_records_sql("SELECT COUNT(mpn.id) " . $fromsql); $total = $DB->count_records_sql("SELECT COUNT(mpn.id) " . $fromsql);
if ($total > 0) {
$i = 0; $i = 0;
$pbar = new progress_bar('deletepopupnotification', 500, true); $pbar = new progress_bar('deletepopupnotification', 500, true);
do { do {
@ -62,8 +63,9 @@ function xmldb_message_popup_upgrade($oldversion) {
$pbar->update($i, $total, "Cleaning up orphaned popup notification records - $i/$total."); $pbar->update($i, $total, "Cleaning up orphaned popup notification records - $i/$total.");
} }
} while ($popupnotifications); } while ($popupnotifications);
}
// Reportbuilder savepoint reached. // Popup message processor savepoint reached.
upgrade_plugin_savepoint(true, 2020020600, 'message', 'popup'); upgrade_plugin_savepoint(true, 2020020600, 'message', 'popup');
} }