diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /mod/chat.php | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
Diffstat (limited to 'mod/chat.php')
| -rw-r--r-- | mod/chat.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/mod/chat.php b/mod/chat.php index 0f2b94b9d..bf6eed57c 100644 --- a/mod/chat.php +++ b/mod/chat.php @@ -145,6 +145,7 @@ function chat_content(&$a) { if(argc() > 2 && intval(argv(2))) { + $room_id = intval(argv(2)); $bookmark_link = get_bookmark_link($ob); @@ -202,6 +203,7 @@ function chat_content(&$a) { $o = replace_macros(get_markup_template('chatroom_new.tpl'),array( '$header' => t('New Chatroom'), '$name' => array('room_name',t('Chatroom Name'),'', ''), + '$permissions' => t('Permissions'), '$acl' => populate_acl($channel_acl), '$submit' => t('Submit') )); @@ -210,12 +212,13 @@ function chat_content(&$a) { + require_once('include/conversation.php'); - + $o = profile_tabs($a,((local_user() && local_user() == $a->profile['profile_uid']) ? true : false),$a->profile['channel_address']); require_once('include/widgets.php'); - $o = replace_macros(get_markup_template('chatrooms.tpl'), array( + $o .= replace_macros(get_markup_template('chatrooms.tpl'), array( '$header' => sprintf( t('%1$s\'s Chatrooms'), $a->profile['name']), '$baseurl' => z_root(), '$nickname' => $channel['channel_address'], @@ -226,4 +229,4 @@ function chat_content(&$a) { return $o; -}
\ No newline at end of file +} |