Bastelstube/Tims-Chat
1
0
Fork 0
mirror of https://github.com/wbbaddons/Tims-Chat.git synced 2024-12-21 21:30: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:53:59 +02:00
commit b7ceab9537
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -149,14 +149,13 @@ public function jsonify($raw = false) {
case self::TYPE_INFORMATION: case self::TYPE_INFORMATION:
$separator = ':'; $separator = ':';
break; break;
case self::TYPE_JOIN:
unset($additionalData['ipAddress']);
break;
default: default:
$separator = ''; $separator = '';
break; break;
} }
if ($this->type == self::TYPE_JOIN) unset($additionalData['ipAddress']);
$time = \wcf\util\DateUtil::getDateTimeByTimestamp($this->time); $time = \wcf\util\DateUtil::getDateTimeByTimestamp($this->time);
$startOfDay = new \DateTime('today', WCF::getUser()->getTimezone()); $startOfDay = new \DateTime('today', WCF::getUser()->getTimezone());
$array = array( $array = array(