MDL-16267 and MDL-10107 Fixed a typo

diff --git a/message/output/popup/message_output_popup.php b/message/output/popup/message_output_popup.php
index 0a57a8ec6bfed7a659d6c6f326e42d812b77f242..8e281451a55fc81da3f88fd1547ca28a89bf1ec4 100644 (file)
--- a/message/output/popup/message_output_popup.php
+++ b/message/output/popup/message_output_popup.php
@@ -82,10 +82,10 @@ class message_output_popup extends message_output{
         return true;
     }
     public function load_data(&$preferences, $userid) {
-        $preferences->showmessagewindow =  get_user_preferences( 'message_showmessagewindow', 1, $user->id);
-        $preferences->blocknoncontacts  =  get_user_preferences( 'message_blocknoncontacts', '', $user->id);
-        $preferences->beepnewmessage    =  get_user_preferences( 'message_beepnewmessage', '', $user->id);
-        $preferences->noframesjs        =  get_user_preferences( 'message_noframesjs', '', $user->id);
+        $preferences->showmessagewindow =  get_user_preferences( 'message_showmessagewindow', 1, $userid);
+        $preferences->blocknoncontacts  =  get_user_preferences( 'message_blocknoncontacts', '', $userid);
+        $preferences->beepnewmessage    =  get_user_preferences( 'message_beepnewmessage', '', $userid);
+        $preferences->noframesjs        =  get_user_preferences( 'message_noframesjs', '', $userid);
         return true;
     }
 }