L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-42533-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

Browse Source
This commit is contained in:
Dan Poltawski
2013-11-04 21:55:40 +08:00
parent dcb6e4169b c9bcb47d54
commit 8a7078b28b
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/conditionlib.php
+7 -1
View File
@@ -1035,8 +1035,14 @@ abstract class condition_info_base {
if (!$this->is_field_condition_met($details->operator, $uservalue, $details->value)) {
// Set available to false
$available = false;
// Display the fieldname into current lang.
if (is_numeric($field)) {
$translatedfieldname = $details->fieldname;
} else {
$translatedfieldname = get_user_field_name($details->fieldname);
}
$a = new stdClass();
$a->field = format_string($details->fieldname, true, array('context' => $context));
$a->field = format_string($translatedfieldname, true, array('context' => $context));
$a->value = s($details->value);
$information .= get_string('requires_user_field_'.$details->operator, 'condition', $a) . ' ';
}