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 c4d94539df5797c01dad0cfd64d9f4fc0c754242..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));
        }
 }