MDL-15887 Merging from MOODLE_19_STABLE

diff --git a/grade/report/user/lib.php b/grade/report/user/lib.php
index fa50e50cc2249d005ebcffc7e3e623b532a6325d..c86d67b7c1782ee22c099ffd9748e4e60caddd04 100644 (file)
--- a/grade/report/user/lib.php
+++ b/grade/report/user/lib.php
@@ -347,9 +347,9 @@ function grade_report_user_settings_definition(&$mform) {
     $mform->setHelpButton('report_user_showrank', array('showrank', get_string('showrank', 'grades'), 'grade'));
 
     if (empty($CFG->grade_report_user_showpercentage)) {
-        $options[-1] = get_string('defaultprev', 'grades', $options[0]);
-    } else {
         $options[-1] = get_string('defaultprev', 'grades', $options[1]);
+    } else {
+        $options[-1] = get_string('defaultprev', 'grades', $options[0]);
     }
 
     $mform->addElement('select', 'report_user_showpercentage', get_string('showpercentage', 'grades'), $options);

diff --git a/grade/report/user/settings.php b/grade/report/user/settings.php
index 79e6139159104dae82c1558a1594354cc5194a32..bdbc6b8784913438671f9bff47c9e1ef1fadcb34 100644 (file)
--- a/grade/report/user/settings.php
+++ b/grade/report/user/settings.php
@@ -26,7 +26,7 @@
 /// Add settings for this module to the $settings object (it's already defined)
 
 $settings->add(new admin_setting_configcheckbox('grade_report_user_showrank', get_string('showrank', 'grades'), get_string('configshowrank', 'grades'), 0, PARAM_INT));
-$settings->add(new admin_setting_configcheckbox('grade_report_user_showpercentage', get_string('showpercentage', 'grades'), get_string('configshowpercentage', 'grades'), 1, PARAM_INT));
+$settings->add(new admin_setting_configcheckbox('grade_report_user_showpercentage', get_string('showpercentage', 'grades'), get_string('configshowpercentage', 'grades'), 2, PARAM_INT));
 
 $options = array(0 => get_string('shownohidden', 'grades'),
                  1 => get_string('showhiddenuntilonly', 'grades'),