Merge branch 'zap'

This commit is contained in:
zotlabs 2018-09-16 18:42:25 -07:00
commit e38adcef70
2 changed files with 2 additions and 2 deletions

View file

@ -317,7 +317,7 @@ class Apps {
'Suggest Channels' => t('Suggest Channels'), 'Suggest Channels' => t('Suggest Channels'),
'Login' => t('Login'), 'Login' => t('Login'),
'Channel Manager' => t('Channel Manager'), 'Channel Manager' => t('Channel Manager'),
'Grid' => t('Activity'), 'Network' => t('Stream'),
'Settings' => t('Settings'), 'Settings' => t('Settings'),
'Files' => t('Files'), 'Files' => t('Files'),
'Webpages' => t('Webpages'), 'Webpages' => t('Webpages'),

View file

@ -177,7 +177,7 @@ class Network extends \Zotlabs\Web\Controller {
)); ));
} }
nav_set_selected('Grid'); nav_set_selected('Stream');
$channel_acl = array( $channel_acl = array(
'allow_cid' => $channel['channel_allow_cid'], 'allow_cid' => $channel['channel_allow_cid'],