fixes: after rm -rf server/data/* and one reload of the interface, a …

…javascript error appears
kerphi · Jan 9, 2013 · a3596b7 · a3596b7
1 parent 28159cf
commit a3596b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/client/jquery.phpfreechat.core.js b/client/jquery.phpfreechat.core.js
@@ -74,10 +74,11 @@ var phpFreeChat = (function (pfc, $, window, undefined) {
       // store userdata in the cache
       // refresh the interface
       pfc.clearUserList();
-      $.each(cinfo.users, function (uid) {
+      $.each(cinfo.users, function (uid, udata) {
         pfc.channels[cid].users.push(uid);
-        pfc.users[uid] = cinfo.users[uid];
-        pfc.appendUser(cinfo.users[uid]);
+
+        pfc.users[uid] = udata;
+        pfc.appendUser(udata);
       });
 
       // display a join message for him

diff --git a/server/routes/channels.php b/server/routes/channels.php
@@ -62,7 +62,10 @@
   if (!Container_users::joinChannel($uid, $cid)) {
     $res->status(200); // User already joined the channel
     $res['Content-Type'] = 'application/json; charset=utf-8';
-    $res->body(json_encode(Container_channels::getChannelUsers($cid, true)));
+    $res->body(json_encode(array(
+      'users' => Container_channels::getChannelUsers($cid, true),
+      'op'    => Container_channels_op::getOpList($cid),      
+    )));
     return;
   } else {
     // post a join message