When using set_user_preference on other people, don't change the preference in $USER

diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index db31c1a79a5b9b93b9f0d76d52593c539abf4630..d4ad8e3aa10857b4558900f21729633a94933605 100644 (file)
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -338,17 +338,18 @@ function reload_user_preferences() {
  * @todo Add inline links to $USER and user functions in above line.
  * @return boolean
  */
-function set_user_preference($name, $value, $userid=NULL) {
+function set_user_preference($name, $value, $otheruser=NULL) {
 
     global $USER;
 
-    if (empty($userid)){
-        if(!empty($USER) && !empty($USER->id)) {
+    if (empty($otheruser)){
+        if (!empty($USER) && !empty($USER->id)) {
             $userid = $USER->id;
-        }
-        else {
+        } else {
             return false;
         }
+    } else {
+        $userid = $otheruser;
     }
 
     if (empty($name)) {
@@ -357,7 +358,7 @@ function set_user_preference($name, $value, $userid=NULL) {
 
     if ($preference = get_record('user_preferences', 'userid', $userid, 'name', $name)) {
         if (set_field('user_preferences', 'value', $value, 'id', $preference->id)) {
-            if(!empty($USER)) {
+            if (empty($otheruser) and !empty($USER)) {
                 $USER->preference[$name] = $value;
             }
             return true;
@@ -370,7 +371,7 @@ function set_user_preference($name, $value, $userid=NULL) {
         $preference->name   = $name;
         $preference->value  = (string)$value;
         if (insert_record('user_preferences', $preference)) {
-            if(!empty($USER)) {
+            if (empty($otheruser) and !empty($USER)) {
                 $USER->preference[$name] = $value;
             }
             return true;