Merge branch 'dev' into pdo

2016-10-20 16:14:01 -07:00
parent e2e3b81f32 edde785219
commit 8a34f7ca7b
4 changed files with 146 additions and 36 deletions
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1536,7 +1536,11 @@ function network_tabs() {
 	// tabs
 	$tabs = array();

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