Default discover to on.

5 files changed, 7 insertions, 7 deletions

diff --git a/include/conversation.php b/include/conversation.php
index a6e81dd7f..af41e8fa7 100644
--- a/include/conversation.php
+++ b/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'] : ''),
diff --git a/include/poller.php b/include/poller.php
index 0eb161862..9592c29e4 100644
--- a/include/poller.php
+++ b/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');
 
 
diff --git a/mod/admin.php b/mod/admin.php
index ad539f419..3655bd09a 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -244,7 +244,7 @@ function admin_page_site_post(&$a){
 	$allowed_email		=	((x($_POST,'allowed_email'))	? notags(trim($_POST['allowed_email']))		: '');
 	$block_public		=	((x($_POST,'block_public'))		? True	:	False);
 	$force_publish		=	((x($_POST,'publish_all'))		? True	:	False);
-	$discover_tab		=	((x($_POST,'discover_tab'))		? True	:	False);
+	$disable_discover_tab		=	((x($_POST,'disable_discover_tab'))		? True	:	False);
 	$no_login_on_homepage	=	((x($_POST,'no_login_on_homepage'))		? True	:	False);
 	$global_directory	=	((x($_POST,'directory_submit_url'))	? notags(trim($_POST['directory_submit_url']))	: '');
 	$no_community_page	=	!((x($_POST,'no_community_page'))	? True	:	False);
@@ -342,7 +342,7 @@ function admin_page_site_post(&$a){
 	set_config('system','allowed_email', $allowed_email);
 	set_config('system','block_public', $block_public);
 	set_config('system','publish_all', $force_publish);
-	set_config('system','discover_tab', $discover_tab);
+	set_config('system','disable_discover_tab', $disable_discover_tab);
 	if($global_directory=="") {
 		del_config('system','directory_submit_url');
 	} 
@@ -464,7 +464,7 @@ function admin_page_site(&$a) {
 		'$allowed_email'	=> array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
 		'$block_public'		=> array('block_public', t("Block public"), get_config('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
 		'$force_publish'	=> array('publish_all', t("Force publish"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
-		'$discover_tab'	=> array('discover_tab', t("Discovery tab"), ((get_config('system','discover_tab') === false) ? 1 : get_config('system','discover_tab')), t("Display a tab in the network view with public content pulled from sources chosen for this site.")),
+		'$disable_discover_tab'	=> array('disable_discover_tab', t("Disable discovery tab"), get_config('system','disable_discover_tab'), t("Remove the tab in the network view with public content pulled from sources chosen for this site.")),
 		'$no_login_on_homepage'	=> array('no_login_on_homepage', t("No login on Homepage"), get_config('system','no_login_on_homepage'), t("Check to hide the login form from your sites homepage when visitors arrive who are not logged in (e.g. when you put the content of the homepage in via the site channel).")),
 			
 		'$proxyuser'		=> array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
diff --git a/mod/network.php b/mod/network.php
index 09098946f..0db85f428 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -319,7 +319,7 @@ function network_content(&$a, $update = 0, $load = false) {
 
 	}
 
-	if($firehose && get_config('system','discover_tab')) {
+	if($firehose && (! get_config('system','discover_tab'))) {
 		require_once('include/identity.php');
 		$sys = get_sys_channel();
 		$uids = " and item.uid  = " . intval($sys['channel_id']) . " ";
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 22cefdea4..c6c15cec4 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -66,7 +66,7 @@
 	<h3>{{$corporate}}</h3>
 	{{include file="field_checkbox.tpl" field=$block_public}}
 	{{include file="field_checkbox.tpl" field=$force_publish}}
-	{{include file="field_checkbox.tpl" field=$discover_tab}}
+	{{include file="field_checkbox.tpl" field=$disable_discover_tab}}
 	
 	<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>