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

MDL-49061 reports: call format_string on activities names

Browse source
This commit is contained in:
Marina Glancy 2015-03-12 19:44:39 +08:00
parent 753d681076
commit bdbe385cc2
3 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

9
completion/criteria/completion_criteria_activity.php
View file

@ -60,7 +60,11 @@ class completion_criteria_activity extends completion_criteria {
* @param stdClass $data details of various modules
*/
public function config_form_display(&$mform, $data = null) {
$mform->addElement('checkbox', 'criteria_activity['.$data->id.']', ucfirst(self::get_mod_name($data->module)).' - '.$data->name);
$modnames = get_module_types_names();
$mform->addElement('checkbox', 'criteria_activity['.$data->id.']',
$modnames[self::get_mod_name($data->module)].
' - '.
format_string($data->name));
if ($this->id) {
$mform->setDefault('criteria_activity['.$data->id.']', 1);
@ -177,7 +181,8 @@ class completion_criteria_activity extends completion_criteria {
$module = $DB->get_record('course_modules', array('id' => $this->moduleinstance));
$activity = $DB->get_record($this->module, array('id' => $module->instance));
return shorten_text(urldecode($activity->name));
return shorten_text(format_string($activity->name, true,
array('context' => context_module::instance($module->id))));
}
/**