Commit db85a8fe authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review
Browse files

Merge "Clean expired passwords causes error when upgrading (bug 1369370)"

parents 685dfca0 8f371b7d
...@@ -3409,6 +3409,7 @@ function xmldb_core_upgrade($oldversion=0) { ...@@ -3409,6 +3409,7 @@ function xmldb_core_upgrade($oldversion=0) {
} }
if ($oldversion < 2014062000) { if ($oldversion < 2014062000) {
$where = array('callfunction' => 'auth_clean_expired_password_requests');
$data = array('callfunction' => 'auth_clean_expired_password_requests', $data = array('callfunction' => 'auth_clean_expired_password_requests',
'minute' => '5', 'minute' => '5',
'hour' => '0', 'hour' => '0',
...@@ -3416,7 +3417,7 @@ function xmldb_core_upgrade($oldversion=0) { ...@@ -3416,7 +3417,7 @@ function xmldb_core_upgrade($oldversion=0) {
'month' => '*', 'month' => '*',
'dayofweek' => '*', 'dayofweek' => '*',
); );
ensure_record_exists('cron', (object)$data, (object)$data); ensure_record_exists('cron', (object)$where, (object)$data);
} }
// Add feedbacknotify option to group table // Add feedbacknotify option to group table
......
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