Merge remote-tracking branch 'mike/master' into dev

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;
 

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;
 
 	/**