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

consolidate disable_discover_tab config if it was not yet set to either 1 or 0 in DB

Browse Source
This commit is contained in:
git-marijus
2017-08-06 21:40:39 +02:00
parent 913046aa28
commit 0085b64b2b
5 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/conversation.php
View File

@@ -1622,11 +1622,9 @@ function network_tabs() {
// tabs
$tabs = array();
$d = get_config('system','disable_discover_tab');
if($d === false)
$d = 1;
$disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false;
if(! $d) {
if(! $disable_discover_tab) {
$tabs[] = array(
'label' => t('Discover'),
'url' => z_root() . '/' . $cmd . '?f=&fh=1' ,

4
include/zot.php
View File

@@ -1326,8 +1326,10 @@ function public_recips($msg) {
$include_sys = false;
if($msg['message']['type'] === 'activity') {
if(! get_config('system','disable_discover_tab'))
$disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false;
if(! $disable_discover_tab)
$include_sys = true;
$perm = 'send_stream';
if(array_key_exists('flags',$msg['message']) && in_array('thread_parent', $msg['message']['flags'])) {