Merge pull request #387 from beardy-unixer/master

Default discover to on

include/conversation.php

@@ -1384,7 +1384,7 @@ function network_tabs() {
 	// tabs
 	$tabs = array();
 
-	if(get_config('system','discover_tab')) {
+	if(! get_config('system','disable_discover_tab')) {
 		$tabs[] = array(
 			'label' => t('Discover'),
 			'url'=>$a->get_baseurl(true) . '/' . $cmd . '?f=&fh=1' . ((x($_GET,'cid')) ? '&cid=' . $_GET['cid'] : '') . ((x($_GET,'gid')) ? '&gid=' . $_GET['gid'] : ''),

include/poller.php

@@ -169,7 +169,7 @@ function poller_run($argv, $argc){
 
 
 	// pull in some public posts
-        if(get_config('system','discover_tab'))
+        if(! get_config('system','disable_discover_tab'))
 		proc_run('php','include/externals.php');