aboutsummaryrefslogtreecommitdiffstats
path: root/mod/chat.php
diff options
context:
space:
mode:
authorHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-11 06:42:11 +0200
committerHaakon Meland Eriksen <haakon.eriksen@far.no>2015-09-11 06:42:11 +0200
commitedb1473f13a87ccfdfe2555ac9ab798fbc073805 (patch)
tree18a15afbca3cdbbf262e0737d01e23e7b4905cf1 /mod/chat.php
parent2f73d24ab134391c3b3a69d5cbfede42e028b5ed (diff)
parentf2171173fe2c9a0596672da293eb756a514ff789 (diff)
downloadvolse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.gz
volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.tar.bz2
volse-hubzilla-edb1473f13a87ccfdfe2555ac9ab798fbc073805.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/chat.php')
-rw-r--r--mod/chat.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/mod/chat.php b/mod/chat.php
index c2c11d0ab..9ad58bc32 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -62,11 +62,13 @@ function chat_post(&$a) {
chatroom_create($channel,$arr);
- $x = q("select cr_id from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
+ $x = q("select * from chatroom where cr_name = '%s' and cr_uid = %d limit 1",
dbesc($room),
intval(local_channel())
);
+ create_sync_packet(0, array('chatroom' => $x));
+
if($x)
goaway(z_root() . '/chat/' . $channel['channel_address'] . '/' . $x[0]['cr_id']);