aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-02-15 09:00:52 +0100
committerMario Vavti <mario@mariovavti.com>2018-02-15 09:00:52 +0100
commit45b42cbc1c5356da61923f5bc2fbca1cec9f9119 (patch)
treeb052b2d5e52b751aa7242e7938fca56879d2da7e /include
parent033608292007a726b6fdffe839f6e481939f7a1d (diff)
parent465d89129caaaa0240229f8d6f81d68f26eb60b0 (diff)
downloadvolse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.tar.gz
volse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.tar.bz2
volse-hubzilla-45b42cbc1c5356da61923f5bc2fbca1cec9f9119.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
-rw-r--r--include/nav.php4
2 files changed, 2 insertions, 4 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 77694deb3..0bb9c769a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -974,7 +974,7 @@ function author_is_pmable($xchan, $abook) {
if($x['result'] !== 'unset')
return $x['result'];
- if($xchan['xchan_network'] === 'zot')
+ if($xchan['xchan_network'] === 'zot' && get_observer_hash())
return true;
return false;
diff --git a/include/nav.php b/include/nav.php
index 9c88541d1..df58ee96f 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -73,9 +73,7 @@ EOT;
// nav links: array of array('href', 'text', 'extra css classes', 'title')
$nav = [];
- $disable_discover_tab = get_config('system','disable_discover_tab') || get_config('system','disable_discover_tab') === false;
-
- if(! $disable_discover_tab)
+ if(can_view_public_stream())
$nav['pubs'] = true;
/**