Merge branch 'MDL-33398b-22' of git://github.com/srynot4sale/moodle into MOODLE_22_STABLE
This commit is contained in:
@@ -229,7 +229,7 @@ class completion_criteria_activity extends completion_criteria {
|
||||
// Loop through completions, and mark as complete
|
||||
$rs = $DB->get_recordset_sql($sql);
|
||||
foreach ($rs as $record) {
|
||||
$completion = new completion_criteria_completion($record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion->mark_complete($record->timecompleted);
|
||||
}
|
||||
$rs->close();
|
||||
|
||||
@@ -189,7 +189,7 @@ class completion_criteria_course extends completion_criteria {
|
||||
// Loop through completions, and mark as complete
|
||||
$rs = $DB->get_recordset_sql($sql);
|
||||
foreach ($rs as $record) {
|
||||
$completion = new completion_criteria_completion($record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion->mark_complete($record['timecompleted']);
|
||||
}
|
||||
$rs->close();
|
||||
|
||||
@@ -179,7 +179,7 @@ class completion_criteria_date extends completion_criteria {
|
||||
// Loop through completions, and mark as complete
|
||||
$rs = $DB->get_recordset_sql($sql, array(time()));
|
||||
foreach ($rs as $record) {
|
||||
$completion = new completion_criteria_completion($record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion->mark_complete($record['timeend']);
|
||||
}
|
||||
$rs->close();
|
||||
|
||||
@@ -225,7 +225,7 @@ class completion_criteria_duration extends completion_criteria {
|
||||
$now = time();
|
||||
$rs = $DB->get_recordset_sql($sql, array($now, $now));
|
||||
foreach ($rs as $record) {
|
||||
$completion = new completion_criteria_completion($record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
|
||||
// Use time start if not 0, otherwise use timeenrolled
|
||||
if ($record->otimestart) {
|
||||
|
||||
@@ -215,7 +215,7 @@ class completion_criteria_grade extends completion_criteria {
|
||||
// Loop through completions, and mark as complete
|
||||
$rs = $DB->get_recordset_sql($sql);
|
||||
foreach ($rs as $record) {
|
||||
$completion = new completion_criteria_completion($record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion = new completion_criteria_completion((array) $record, DATA_OBJECT_FETCH_BY_KEY);
|
||||
$completion->mark_complete($record['timecompleted']);
|
||||
}
|
||||
$rs->close();
|
||||
|
||||
Reference in New Issue
Block a user