aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-02-21 18:58:51 -0800
committerzotlabs <mike@macgirvin.com>2017-02-21 18:58:51 -0800
commit6644dc4861272273acf683dd6e06ceb586f2e4db (patch)
treea802599a1b8e60ec2da13a72b7816b3970f3a00c /include
parentbbacfbdd6ac09786194502350deb50b0244166b2 (diff)
downloadvolse-hubzilla-6644dc4861272273acf683dd6e06ceb586f2e4db.tar.gz
volse-hubzilla-6644dc4861272273acf683dd6e06ceb586f2e4db.tar.bz2
volse-hubzilla-6644dc4861272273acf683dd6e06ceb586f2e4db.zip
use head_add_link() for feed discovery
Diffstat (limited to 'include')
-rw-r--r--include/channel.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/channel.php b/include/channel.php
index 856fb6303..71ba2476f 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1976,9 +1976,7 @@ function channel_manual_conv_update($channel_id) {
$x = get_pconfig($channel_id, 'system','manual_conversation_update');
if($x === false)
- $x = get_config('system','manual_conversation_update');
- if($x === false)
- $x = 1;
+ $x = get_config('system','manual_conversation_update', 1);
return intval($x);