moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-32386 completion: Fix incorrect method parameters

Browse source
This commit is contained in:
Aaron Barnes 2012-07-20 13:40:42 +12:00
parent d71c486507
commit 1caeb4b450
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/completionlib.php
View file

@ -621,16 +621,20 @@ class completion_info {
debugging('set_module_viewed must be called before header is printed', debugging('set_module_viewed must be called before header is printed',
DEBUG_DEVELOPER); DEBUG_DEVELOPER);
} }
// Don't do anything if view condition is not turned on // Don't do anything if view condition is not turned on
if ($cm->completionview == COMPLETION_VIEW_NOT_REQUIRED || !$this->is_enabled($cm)) { if ($cm->completionview == COMPLETION_VIEW_NOT_REQUIRED || !$this->is_enabled($cm)) {
return; return;
} }
// Get current completion state // Get current completion state
$data = $this->get_data($cm, $userid); $data = $this->get_data($cm, false, $userid);
// If we already viewed it, don't do anything // If we already viewed it, don't do anything
if ($data->viewed == COMPLETION_VIEWED) { if ($data->viewed == COMPLETION_VIEWED) {
return; return;
} }
// OK, change state, save it, and update completion // OK, change state, save it, and update completion
$data->viewed = COMPLETION_VIEWED; $data->viewed = COMPLETION_VIEWED;
$this->internal_set_data($cm, $data); $this->internal_set_data($cm, $data);

2
lib/tests/completionlib_test.php
View file

@ -257,7 +257,7 @@ class completionlib_testcase extends basic_testcase {
->will($this->returnValue(true)); ->will($this->returnValue(true));
$c->expects($this->at(1)) $c->expects($this->at(1))
->method('get_data') ->method('get_data')
->with($cm, 1337) ->with($cm, false, 1337)
->will($this->returnValue((object)array('viewed'=>COMPLETION_NOT_VIEWED))); ->will($this->returnValue((object)array('viewed'=>COMPLETION_NOT_VIEWED)));
$c->expects($this->at(2)) $c->expects($this->at(2))
->method('internal_set_data') ->method('internal_set_data')