From: nicolasconnault <nicolasconnault>
Date: Wed, 5 Mar 2008 07:10:16 +0000 (+0000)
Subject: MDL-13787 Updated get_pref() so that it looks up a short version of the config variab... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=54294d3b0918306defc429431d7c9191e189d247;p=moodle.git

MDL-13787 Updated get_pref() so that it looks up a short version of the config variable (grade_ instead of grade_report_) in case the first isn't set. It also returns null if no variable is found. Merging from MOODLE_19_STABLE
---

diff --git a/grade/report/lib.php b/grade/report/lib.php
index b335a5eae2..c38fadf066 100755
--- 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])) {