aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-03 16:16:14 -0700
committerredmatrix <git@macgirvin.com>2016-04-03 16:16:14 -0700
commitb4c1baada1fba46d4d75f40a7e78111d70d54e7a (patch)
tree0dcf211c433479409a2ea932d1c0ca6bc463562d /mod
parent1ca3eeedffe4fb443a19b4b84e16a73522990334 (diff)
parentf13096a6f3b26d9e88dc0d6c07c63a1d5f75346e (diff)
downloadvolse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.tar.gz
volse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.tar.bz2
volse-hubzilla-b4c1baada1fba46d4d75f40a7e78111d70d54e7a.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into master_merge
Diffstat (limited to 'mod')
-rw-r--r--mod/chat.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/mod/chat.php b/mod/chat.php
index 211846964..75c364008 100644
--- a/mod/chat.php
+++ b/mod/chat.php
@@ -240,6 +240,8 @@ function chat_content(&$a) {
'$newroom' => t('Create New'),
'$is_owner' => ((local_channel() && local_channel() == App::$profile['profile_uid']) ? 1 : 0),
'$chatroom_new' => $chatroom_new,
+ '$expire' => t('Expiration'),
+ '$expire_unit' => t('min') //minutes
));
return $o;