diff options
| author | friendica <info@friendica.com> | 2014-09-01 04:17:10 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-01 04:17:10 -0700 |
| commit | 76a72a997d710f4cd53822313260fb259efb63cf (patch) | |
| tree | 21f9346c94a87f5612c59ad5d057b91362d79188 | |
| parent | 2a37d99958d5591d5b9ccfc9bc615ee0588a6036 (diff) | |
| download | volse-hubzilla-76a72a997d710f4cd53822313260fb259efb63cf.tar.gz volse-hubzilla-76a72a997d710f4cd53822313260fb259efb63cf.tar.bz2 volse-hubzilla-76a72a997d710f4cd53822313260fb259efb63cf.zip | |
honour the feed_contacts setting
| -rw-r--r-- | include/follow.php | 5 | ||||
| -rw-r--r-- | version.inc | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/follow.php b/include/follow.php index 102d84605..d1c6afbee 100644 --- a/include/follow.php +++ b/include/follow.php @@ -176,6 +176,11 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) } if($is_http) { + if(! intval(get_config('system','feed_contacts'))) { + $result['message'] = t('Protocol disabled.'); + return $result; + } + $r = q("select count(*) as total from abook where abook_account = %d and abook_network = 'rss'", intval($aid) ); diff --git a/version.inc b/version.inc index 29de108fb..d8c959b4b 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2014-08-31.784 +2014-09-01.785 |