allow stuff with Diaspora authors to federate in zot conversations even if the local site has diaspora disabled. This way it won't look like folks are talking to themselves.

1 files changed, 6 insertions, 0 deletions

diff --git a/include/follow.php b/include/follow.php
index e6c42aad1..058f5d60b 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -118,6 +118,12 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
 		}
 	}
 	else {
+		if(! ($is_http)) {
+			if(! intval(get_config('system','diaspora_enabled'))) {
+				$result['message'] = t('Protocol disabled.');
+				return $result;
+			}
+		}
 
 		$my_perms = 0;
 		$their_perms = 0;