diff options
| author | RedMatrix <info@friendica.com> | 2014-03-31 09:22:00 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2014-03-31 09:22:00 +1100 |
| commit | 8efef6f98b540da9fd256bf108eeb3b32666c170 (patch) | |
| tree | 0a26ace9d3ead0b41627a9c53818f5a8e0a21bec /include | |
| parent | b00478d3b5e6d12e2c726fbdde931b5e64ad5da9 (diff) | |
| parent | 4a2805e12ebb7c72dd7e72de4fc192149867706a (diff) | |
| download | volse-hubzilla-8efef6f98b540da9fd256bf108eeb3b32666c170.tar.gz volse-hubzilla-8efef6f98b540da9fd256bf108eeb3b32666c170.tar.bz2 volse-hubzilla-8efef6f98b540da9fd256bf108eeb3b32666c170.zip | |
Merge pull request #387 from beardy-unixer/master
Default discover to on
Diffstat (limited to 'include')
| -rw-r--r-- | include/conversation.php | 2 | ||||
| -rw-r--r-- | include/poller.php | 2 |
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'); |