Commit 81c04a73 authored by Robert Lyon's avatar Robert Lyon
Browse files

Bug 1557160: Allow submission export re-queue clear any cron lock

Also added a couple of missing accessibility strings


Change-Id: Ia50f587ae0c46e4972086a72606796e1aa822642
Signed-off-by: Robert Lyon's avatarRobert Lyon <>
parent 9cf83e93
......@@ -123,6 +123,9 @@ if ($action = param_alphanum('action', null)) {
foreach ($rowids as $rowid) {
execute_sql('UPDATE {export_queue} SET starttime = NULL, ctime = NOW() WHERE id = ?', array($rowid));
// And clear cron lock
// @TODO - use the actual cron_free function when cron/lib.php actually contains a cron class
delete_records('config', 'field', '_cron_lock_core_export_process_queue');
$SESSION->add_ok_msg(get_string('exportqueuearchived', 'admin', count($rowids)));
......@@ -1303,3 +1303,6 @@ $string['cli_restore_done'] = 'Restored backup of "%s" done';
$string['cli_restore_warning'] = '*** WARNING *** Unable to restore backup of "%s"';
$string['cli_tmpdir_notwritable'] = 'Temporary upload directory "%s" is not writable.';
$string['cli_lang_branch'] = 'Mahara series version to fetch langpacks for series "%s"';
$string['withselectedcontentexport'] = 'Re-queue items into export queue';
$string['withselectedcontentdelete'] = 'Delete selected items from export queue';
{if $r.statustype eq 'failed'}<span class="requiredmarker">{/if}{$r.status}{if $r.statustype eq 'failed'}</span>{/if}
\ No newline at end of file
{if $r.statustype eq 'failed'}<span class="errmsg">{/if}{$r.status}{if $r.statustype eq 'failed'}</span>{/if}
\ No newline at end of file
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment