From: moodler <moodler>
Date: Tue, 25 Nov 2008 02:30:27 +0000 (+0000)
Subject: get_user_preferences()   Fixed regression so that it returns single value when required
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=469337539feaa45c53a65f36581d57a632070f56;p=moodle.git

get_user_preferences()   Fixed regression so that it returns single value when required
---

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index caecaff33b..9f82f228f5 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -1109,7 +1109,7 @@ function unset_user_preference($name, $otheruserid=NULL) {
 function get_user_preferences($name=NULL, $default=NULL, $otheruserid=NULL) {
     global $USER, $DB;
 
-    if (empty($otheruserid)){
+    if (empty($otheruserid) || (!empty($USER->id) && ($USER->id == $otheruserid))){
         check_user_preferences_loaded();
 
         if (empty($name)) {
@@ -1123,7 +1123,7 @@ function get_user_preferences($name=NULL, $default=NULL, $otheruserid=NULL) {
     } else {
         if (empty($name)) {
             return $DB->get_records_menu('user_preferences', array('userid'=>$otheruserid), '', 'name,value'); // All values
-        } else if ($value = $DB->get_record('user_preferences', array('userid'=>$otheruserid, 'name'=>$name))) {
+        } else if ($value = $DB->get_field('user_preferences', 'value', array('userid'=>$otheruserid, 'name'=>$name))) {
             return $value; // The single value
         } else {
             return $default; // Default value (or NULL)