aboutsummaryrefslogtreecommitdiffstats
path: root/mod/manage.php
diff options
context:
space:
mode:
authorRedMatrix <info@friendica.com>2014-12-30 08:57:37 +1100
committerRedMatrix <info@friendica.com>2014-12-30 08:57:37 +1100
commit619733e297708f49646bb220658c90223a8648c6 (patch)
tree294d3cdfcae69213aa38b624e9f7982cbde6186b /mod/manage.php
parentd1d4cec932c23c2b42eb77e2734b71a2e80f6772 (diff)
parente69e59d260c311ceae4cbde3239c33d8caea4553 (diff)
downloadvolse-hubzilla-619733e297708f49646bb220658c90223a8648c6.tar.gz
volse-hubzilla-619733e297708f49646bb220658c90223a8648c6.tar.bz2
volse-hubzilla-619733e297708f49646bb220658c90223a8648c6.zip
Merge pull request #789 from pafcu/chanman
Don't show current channel separately in channel manager, highlight it i...
Diffstat (limited to 'mod/manage.php')
-rw-r--r--mod/manage.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/mod/manage.php b/mod/manage.php
index 21327a120..b0de945bf 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -46,15 +46,12 @@ function manage_content(&$a) {
intval(PAGE_REMOVED)
);
- $selected_channel = null;
$account = get_app()->get_account();
if($r && count($r)) {
$channels = $r;
for($x = 0; $x < count($channels); $x ++) {
$channels[$x]['link'] = 'manage/' . intval($channels[$x]['channel_id']);
- if($channels[$x]['channel_id'] == local_user())
- $selected_channel = &$channels[$x]; // Needs to be a reference!
$channels[$x]['default'] = (($channels[$x]['channel_id'] == $account['account_default_channel']) ? "1" : '');
$channels[$x]['default_links'] = '1';
@@ -152,8 +149,8 @@ function manage_content(&$a) {
$o = replace_macros(get_markup_template('channels.tpl'), array(
'$header' => t('Channel Manager'),
'$msg_selected' => t('Current Channel'),
- '$selected' => $selected_channel,
- '$desc' => t('Attach to one of your channels by selecting it.'),
+ '$selected' => local_user(),
+ '$desc' => t('Switch to one of your channels by selecting it.'),
'$msg_default' => t('Default Channel'),
'$msg_make_default' => t('Make Default'),
'$links' => $links,