Fixes #3

bubasuma · Jan 23, 2016 · ae5edda · ae5edda
1 parent 70c0c13
commit ae5edda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/ConversationWidget.php b/ConversationWidget.php
@@ -35,7 +35,8 @@ public function registerJs()
     {
         $id = $this->options['id'];
         if (!isset($this->clientOptions['selector'])) {
-            $this->clientOptions['selector'] = '.' . strstr($this->itemOptions['class'], ' ', true);
+            $class = explode(' ', $this->itemOptions['class']);
+            $this->clientOptions['selector'] = '.' . $class[0];
         }
         $options = Json::htmlEncode($this->clientOptions);
         $user = Json::htmlEncode($this->user);

diff --git a/db/ConversationQuery.php b/db/ConversationQuery.php
@@ -49,7 +49,7 @@ public function init()
             ->params([':userId' => $this->userId])
             ->groupBy(['[[contact_id]]']);
 
-        $this->select(['contact_id', 'id', 'sender_id', 'text', 'created_at'])
+        $this->select(['ms.contact_id', 'm.id', 'm.sender_id', 'm.text', 'm.created_at'])
             ->from(['ms' => $subQuery])
             ->innerJoin(['m' => $tableName], '[[last_message_id]] = [[id]]')
             ->orderBy(['id' => SORT_DESC])