From 3314249c44614d62ba5d22799e48d779a3eb5409 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20D=C3=BCsterhus?= Date: Sun, 27 Nov 2011 13:07:53 +0100 Subject: [PATCH] Read Smilies from default category. --- file/lib/page/ChatPage.class.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/file/lib/page/ChatPage.class.php b/file/lib/page/ChatPage.class.php index 0178cfd..c51e190 100644 --- a/file/lib/page/ChatPage.class.php +++ b/file/lib/page/ChatPage.class.php @@ -18,6 +18,7 @@ class ChatPage extends AbstractPage { public $room = null; public $roomID = 0; public $rooms = array(); + public $smilies = array(); /** * @see \wcf\page\IPage::assignVariables() @@ -28,7 +29,8 @@ public function assignVariables() { WCF::getTPL()->assign(array( 'room' => $this->room, 'roomID' => $this->roomID, - 'rooms' => $this->rooms + 'rooms' => $this->rooms, + 'smilies' => $this->smilies )); } @@ -66,6 +68,9 @@ public function readData() { 'color1' => 0xFF0000, 'color2' => 0x00FF00 )); + + $smilies = \wcf\data\smiley\SmileyCache::getInstance()->getSmilies(); + $this->smilies = $smilies[null]; } /**