diff options
| author | marijus <mario@localhost.localdomain> | 2014-01-25 14:50:05 +0100 |
|---|---|---|
| committer | marijus <mario@localhost.localdomain> | 2014-01-25 14:50:05 +0100 |
| commit | ed00301bb641d716e43876572be640f8252b9b05 (patch) | |
| tree | 6c17b55b161c688d515ab6dd3db1143c0382ae11 | |
| parent | f3fd9535a4468d026cc7f49cb1946ff0c69585c7 (diff) | |
| download | volse-hubzilla-ed00301bb641d716e43876572be640f8252b9b05.tar.gz volse-hubzilla-ed00301bb641d716e43876572be640f8252b9b05.tar.bz2 volse-hubzilla-ed00301bb641d716e43876572be640f8252b9b05.zip | |
disable feature setting for collections and make feature settings for personal and new tab working.
| -rw-r--r-- | include/conversation.php | 14 | ||||
| -rw-r--r-- | include/features.php | 3 |
2 files changed, 10 insertions, 7 deletions
diff --git a/include/conversation.php b/include/conversation.php index cec5993b6..b6ee08e1f 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -1388,21 +1388,23 @@ function network_tabs() { 'sel'=>$postord_active, 'title' => t('Sort by Post Date'), ), + ); - array( + if(feature_enabled(local_user(),'personal_tab')) + $tabs[] = array( 'label' => t('Personal'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&conv=1', 'sel' => $conv_active, 'title' => t('Posts that mention or involve you'), - ), - array( + ); + + if(feature_enabled(local_user(),'new_tab')) + $tabs[] = array( 'label' => t('New'), 'url' => $a->get_baseurl(true) . '/' . $cmd . '?f=' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . '&new=1' . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''), 'sel' => $new_active, 'title' => t('Activity Stream - by date'), - ), - - ); + ); if(feature_enabled(local_user(),'star_posts')) $tabs[] = array( diff --git a/include/features.php b/include/features.php index 1f83eb319..efdf6dc3a 100644 --- a/include/features.php +++ b/include/features.php @@ -46,7 +46,8 @@ function get_features() { 'net_module' => array( t('Network and Stream Filtering'), array('archives', t('Search by Date'), t('Ability to select posts by date ranges')), - array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), + // Disabled until a solution for default feature settings is found. + // array('groups', t('Collections Filter'), t('Enable widget to display Network posts only from selected collections')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use')), array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on')), array('new_tab', t('Network New Tab'), t('Enable tab to display all new Network activity')), |