diff options
| author | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-25 11:32:28 +0000 |
|---|---|---|
| committer | Andrew Manning <andrewmanning@grid.reticu.li> | 2017-08-25 11:32:28 +0000 |
| commit | 49b38bd71b27427cad1c390d81bda3b7d38d8393 (patch) | |
| tree | 2f4c6ce52167fb658459f5d3a30f598f19dd04e0 /include | |
| parent | 75f3e9202e191486b8c9079b08cc6de4e1251b8d (diff) | |
| parent | 383b7928cf41b750ec367abfc8cbfdc71e1a6291 (diff) | |
| download | volse-hubzilla-49b38bd71b27427cad1c390d81bda3b7d38d8393.tar.gz volse-hubzilla-49b38bd71b27427cad1c390d81bda3b7d38d8393.tar.bz2 volse-hubzilla-49b38bd71b27427cad1c390d81bda3b7d38d8393.zip | |
Merge remote-tracking branch 'upstream/dev' into doco
Diffstat (limited to 'include')
| -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 2d5ccb5b1..78d90a6fc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1616,7 +1616,6 @@ function network_tabs() { $conv_active = ''; $spam_active = ''; $postord_active = ''; - $public_active = ''; if(x($_GET,'new')) { $new_active = 'active'; @@ -1638,16 +1637,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'; } @@ -1665,17 +1659,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'] : ''), |