MDL-19090 fixed user report preferences; merged from MOODLE_19_STABLE

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index a261d5b179745f3bfee44738f858ccccc45a8d2b..19d1d02da892ab38d5a33f7a3796df349a2ee220 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -453,14 +453,14 @@ function grade_report_user_settings_definition(&$mform) {
     $mform->setHelpButton('report_user_showpercentage', array('showpercentage', get_string('showpercentage', 'grades'), 'grade'));
 
     $options = array(-1 => get_string('default', 'grades'),
-                      0 => get_string('hide'),
+                      0 => get_string('shownohidden', 'grades'),
                       1 => get_string('showhiddenuntilonly', 'grades'),
-                      2 => get_string('show'));
+                      2 => get_string('showallhidden', 'grades'));
 
     if (empty($CFG->grade_report_user_showhiddenitems)) {
         $options[-1] = get_string('defaultprev', 'grades', $options[0]);
     } else {
-        $options[-1] = get_string('defaultprev', 'grades', $options[1]);
+        $options[-1] = get_string('defaultprev', 'grades', $options[$CFG->grade_report_user_showhiddenitems]);
     }
 
     $mform->addElement('select', 'report_user_showhiddenitems', get_string('showhiddenitems', 'grades'), $options);