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

htdocs/lib/db/upgrade.php

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