Merge branch 'MDL-27491-master' of git://github.com/sammarshallou/moodle

This commit is contained in:
Eloy Lafuente (stronk7) 2011-08-10 23:03:06 +02:00
commit 76f063fa5d
3 changed files with 10 additions and 2 deletions

View File

@ -55,6 +55,11 @@
print_error('invalidtmptid', 'survey');
}
// Update 'viewed' state if required by completion system
require_once($CFG->libdir . '/completionlib.php');
$completion = new completion_info($course);
$completion->set_module_viewed($cm);
$showscales = ($template->name != 'ciqname');
$strsurvey = get_string("modulename", "survey");

View File

@ -246,8 +246,6 @@ function wiki_supports($feature) {
return true;
case FEATURE_COMPLETION_TRACKS_VIEWS:
return true;
case FEATURE_COMPLETION_HAS_RULES:
return true;
case FEATURE_GRADE_HAS_GRADE:
return false;
case FEATURE_GRADE_OUTCOMES:

View File

@ -258,6 +258,11 @@ require_capability('mod/wiki:viewpage', $context);
add_to_log($course->id, 'wiki', 'view', 'view.php?id=' . $cm->id, $wiki->id);
// Update 'viewed' state if required by completion system
require_once($CFG->libdir . '/completionlib.php');
$completion = new completion_info($course);
$completion->set_module_viewed($cm);
if (($edit != - 1) and $PAGE->user_allowed_editing()) {
$USER->editing = $edit;
}