harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge

Browse Source
This commit is contained in:
zotlabs
2017-08-24 18:50:04 -07:00
parent 45c033b9aa 383b7928cf
commit cff5e360fd
8 changed files with 210 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/conversation.php
View File

@@ -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'] : ''),