diff --git a/file/lib/data/chat/message/ChatMessage.class.php b/file/lib/data/chat/message/ChatMessage.class.php index 9e62a2b..ee24a5d 100755 --- a/file/lib/data/chat/message/ChatMessage.class.php +++ b/file/lib/data/chat/message/ChatMessage.class.php @@ -65,7 +65,7 @@ public function getFormattedMessage($outputType = 'text/html') { $message = WCF::getLanguage()->getDynamicVariable('wcf.chat.message.'.$this->type.'.'.$message['type']); break; case self::TYPE_WHISPER: - + $message = @unserialize($message); $message = $message['message']; case self::TYPE_NORMAL: case self::TYPE_ME: diff --git a/file/lib/data/chat/suspension/ChatSuspension.class.php b/file/lib/data/chat/suspension/ChatSuspension.class.php index fe7222e..9dc5ec5 100644 --- a/file/lib/data/chat/suspension/ChatSuspension.class.php +++ b/file/lib/data/chat/suspension/ChatSuspension.class.php @@ -62,7 +62,7 @@ public static function getSuspensionByUserRoomAndType(\wcf\data\user\User $user, $sql = "SELECT * FROM - wcf".WCF_N."_user_group_application + wcf".WCF_N."_chat_suspension WHERE userID = ? AND roomID = ? diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php index 794936b..0136a40 100644 --- a/file/lib/page/ChatPage.class.php +++ b/file/lib/page/ChatPage.class.php @@ -87,6 +87,13 @@ class ChatPage extends AbstractPage { */ public $userData = array(); + /** + * The request that is actually handled. + * + * @var mixed + */ + public $request = null; + /** * @see \wcf\page\IPage::assignVariables() */ @@ -178,28 +185,29 @@ public function readData() { public function readParameters() { parent::readParameters(); + $this->request = $this; switch ($this->action) { case 'Message': - $page = new ChatMessagePage(); - $page->__run(); + $this->request = new ChatMessagePage(); + $this->request->__run(); exit; case 'Log': exit; case 'RefreshRoomList': - $page = new ChatRefreshRoomListPage(); - $page->__run(); + $this->request = new ChatRefreshRoomListPage(); + $this->request->__run(); exit; case 'Send': - $form = new \wcf\form\ChatForm(); - $form->__run(); + $this->request = new \wcf\form\ChatForm(); + $this->request->__run(); exit; case 'Leave': - $action = new \wcf\action\ChatLeaveAction(); - $action->__run(); + $this->request = new \wcf\action\ChatLeaveAction(); + $this->request->__run(); exit; case 'Copyright': - $page = new ChatCopyrightPage(); - $page->__run(); + $this->request = new ChatCopyrightPage(); + $this->request->__run(); exit; } diff --git a/language/de.xml b/language/de.xml index 32c042e..92195ec 100644 --- a/language/de.xml +++ b/language/de.xml @@ -106,7 +106,7 @@ Hinweis: Setzen Sie diese Einstellung nur, wenn Sie wissen, was sie bewirkt. Die - +