aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-03-30 17:41:53 -0700
committerfriendica <info@friendica.com>2014-03-30 17:41:53 -0700
commit3791cee52b43ad1ca1ca5290493734b5971c799c (patch)
treef6aedb9ab140910ecc38cd9f171c7745970b69bc /include
parentac91331c18717642915cbb53e2d91dd0d010f231 (diff)
parent8efef6f98b540da9fd256bf108eeb3b32666c170 (diff)
downloadvolse-hubzilla-3791cee52b43ad1ca1ca5290493734b5971c799c.tar.gz
volse-hubzilla-3791cee52b43ad1ca1ca5290493734b5971c799c.tar.bz2
volse-hubzilla-3791cee52b43ad1ca1ca5290493734b5971c799c.zip
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
-rw-r--r--include/conversation.php2
-rw-r--r--include/poller.php2
2 files changed, 2 insertions, 2 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');