MDL-13787 Updated get_pref() so that it looks up a short version of the config variab...

diff --git a/grade/report/lib.php b/grade/report/lib.php
index b335a5eae2dce4e590faadf4c9ab6085399d986f..c38fadf066c0c1613bebe5d0020b33c7de105f2d 100755 (executable)
--- a/grade/report/lib.php
+++ b/grade/report/lib.php
@@ -170,14 +170,19 @@ class grade_report {
     function get_pref($pref, $objectid=null) {
         global $CFG;
         $fullprefname = 'grade_report_' . $pref;
+        $shortprefname = 'grade_' . $pref;
 
         $retval = null;
 
         if (!isset($this) OR get_class($this) != 'grade_report') {
             if (!empty($objectid)) {
                 $retval = get_user_preferences($fullprefname . $objectid, grade_report::get_pref($pref));
-            } else {
+            } elseif (isset($CFG->$fullprefname)) {
                 $retval = get_user_preferences($fullprefname, $CFG->$fullprefname);
+            } elseif (isset($CFG->$shortprefname)) {
+                $retval = get_user_preferences($fullprefname, $CFG->$shortprefname); 
+            } else {
+                $retval = null;
             }
         } else {
             if (empty($this->prefs[$pref.$objectid])) {