aboutsummaryrefslogtreecommitdiffstats
path: root/mod/manage.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-03-21 21:32:35 -0700
committerredmatrix <git@macgirvin.com>2016-03-21 21:32:35 -0700
commitb081c3e94b9d02b5df024f18e8940ab59ac5bae9 (patch)
tree5b9876dc624a83f21aa94eccff0e349352202e39 /mod/manage.php
parentec99e3ed625110452a694d16f937c35a8d1ba817 (diff)
parent97e1a6dfde7d8d8e23d463ab22f24011cbce0d8c (diff)
downloadvolse-hubzilla-b081c3e94b9d02b5df024f18e8940ab59ac5bae9.tar.gz
volse-hubzilla-b081c3e94b9d02b5df024f18e8940ab59ac5bae9.tar.bz2
volse-hubzilla-b081c3e94b9d02b5df024f18e8940ab59ac5bae9.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod/manage.php')
-rw-r--r--mod/manage.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/mod/manage.php b/mod/manage.php
index 671003efd..1f7c26cd8 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -134,9 +134,7 @@ function manage_content(&$a) {
}
}
- $links = array(
- array( 'new_channel', t('Create a new channel'), t('Create a new channel'))
- );
+ $create = array( 'new_channel', t('Create a new channel'), t('Create New'));
$delegates = q("select * from abook left join xchan on abook_xchan = xchan_hash where
abook_channel = %d and (abook_their_perms & %d) > 0",
@@ -156,8 +154,6 @@ function manage_content(&$a) {
$delegates = null;
}
-
-
$o = replace_macros(get_markup_template('channels.tpl'), array(
'$header' => t('Channel Manager'),
'$msg_selected' => t('Current Channel'),
@@ -165,17 +161,16 @@ function manage_content(&$a) {
'$desc' => t('Switch to one of your channels by selecting it.'),
'$msg_default' => t('Default Channel'),
'$msg_make_default' => t('Make Default'),
- '$links' => $links,
+ '$create' => $create,
'$all_channels' => $channels,
'$mail_format' => t('%d new messages'),
'$intros_format' => t('%d new introductions'),
'$channel_usage_message' => $channel_usage_message,
- '$delegate_header' => t('Delegated Channels'),
+ '$delegated_desc' => t('Delegated Channel'),
'$delegates' => $delegates,
));
-
return $o;
}