From 76a72a997d710f4cd53822313260fb259efb63cf Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 1 Sep 2014 04:17:10 -0700
Subject: honour the feed_contacts setting

---
 include/follow.php | 5 +++++
 version.inc        | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3