Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-22 21:40:08 +00:00
Code Issues Releases Wiki Activity

Merge branch '3.0.x'

Browse Source
This commit is contained in:
Tim Düsterhus 2016-08-17 20:36:39 +02:00
commit 73680786d3
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
file/lib/data/message/Message.class.php
View File

@ -142,12 +142,16 @@ public function getUsername($colored = false) {
* @return string
*/
public function jsonify($raw = false) {
$additionalData = $this->additionalData;
switch ($this->type) {
case self::TYPE_WHISPER:
case self::TYPE_NORMAL:
case self::TYPE_INFORMATION:
$separator = ':';
break;
case self::TYPE_JOIN:
unset($additionalData['ipAddress']);
break;
default:
$separator = '';
break;
@ -168,7 +172,7 @@ public function jsonify($raw = false) {
'type' => (int) $this->type,
'roomID' => (int) $this->roomID,
'messageID' => (int) $this->messageID,
'additionalData' => $this->additionalData
'additionalData' => $additionalData
);
if ($raw) return $array;