Merged changes form main trunk (2.2.8, 2.2.9)

[fa-stable.git] / includes / current_user.inc

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 017a54052bff8fa0868e18d55ffe8938eb4ad86e..8a167e3ffe7acb0dd7ae39a6f0cff2cde818ac1b 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -175,7 +175,7 @@ class current_user
                        update_user_prefs($this->user, $prefs);
                }
 
-               $this->prefs = new user_prefs($prefs);
+               $this->prefs = new user_prefs(get_user($this->user));
        }
 }
 
@@ -481,12 +481,13 @@ function array_search_value($needle, $haystack, $valuekey=null)
 function array_search_keys($needle, $haystack, $valuekey=null)
 {
        $keys = array();
-       foreach($haystack as $key => $value) {
-               $val = isset($valuekey) ? $value[$valuekey] : $value;
-               if ($needle == $val){
-                       $keys[] = $key;
+       if($haystack)
+               foreach($haystack as $key => $value) {
+                       $val = isset($valuekey) ? $value[$valuekey] : $value;
+                       if ($needle == $val){
+                               $keys[] = $key;
+                       }
                }
-       }
        return $keys;
 }
 //