diff options
| author | zotlabs <mike@macgirvin.com> | 2017-08-24 18:50:04 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-08-24 18:50:04 -0700 |
| commit | cff5e360fd70832825ae7d6420602e573622d008 (patch) | |
| tree | 0f23b56604a9309bd28345e83eb8e11bc0e95046 /include/conversation.php | |
| parent | 45c033b9aa461ade1e9041f919c317752d86a315 (diff) | |
| parent | 383b7928cf41b750ec367abfc8cbfdc71e1a6291 (diff) | |
| download | volse-hubzilla-cff5e360fd70832825ae7d6420602e573622d008.tar.gz volse-hubzilla-cff5e360fd70832825ae7d6420602e573622d008.tar.bz2 volse-hubzilla-cff5e360fd70832825ae7d6420602e573622d008.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/include/conversation.php b/include/conversation.php index 9a48a83d2..ec445ba4c 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1623,7 +1623,6 @@ function network_tabs() { $conv_active = ''; $spam_active = ''; $postord_active = ''; - $public_active = ''; if(x($_GET,'new')) { $new_active = 'active'; @@ -1645,16 +1644,11 @@ function network_tabs() { $spam_active = 'active'; } - if(x($_GET,'fh')) { - $public_active = 'active'; - } - if (($new_active == '') && ($starred_active == '') && ($conv_active == '') && ($search_active == '') - && ($spam_active == '') - && ($public_active == '')) { + && ($spam_active == '')) { $no_active = 'active'; } @@ -1672,17 +1666,6 @@ function network_tabs() { // tabs $tabs = array(); - $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false; - - if(! $disable_discover_tab) { - $tabs[] = array( - 'label' => t('Discover'), - 'url' => z_root() . '/' . $cmd . '?f=&fh=1' , - 'sel' => $public_active, - 'title' => t('Imported public streams'), - ); - } - $tabs[] = array( 'label' => t('Commented Order'), 'url'=>z_root() . '/' . $cmd . '?f=&order=comment' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), |