aboutsummaryrefslogtreecommitdiffstats
path: root/include/follow.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-29 23:48:04 -0800
committerfriendica <info@friendica.com>2014-12-29 23:48:04 -0800
commit5cfe0511391e391d46b91efaa8df3501d498fd21 (patch)
tree37239d3dade1c3f1aee197dc7300085994c9549f /include/follow.php
parent50943f439cb755c052507b8b459740a0ded193c2 (diff)
downloadvolse-hubzilla-5cfe0511391e391d46b91efaa8df3501d498fd21.tar.gz
volse-hubzilla-5cfe0511391e391d46b91efaa8df3501d498fd21.tar.bz2
volse-hubzilla-5cfe0511391e391d46b91efaa8df3501d498fd21.zip
initial trinidad checkin
Diffstat (limited to 'include/follow.php')
-rw-r--r--include/follow.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/follow.php b/include/follow.php
index 1abd0e3b9..b763321c2 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -131,7 +131,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
}
else {
if(! ($is_http)) {
- if(! intval(get_config('system','diaspora_enabled'))) {
+ if(! intval(get_config('system','diaspora_enabled')) || defined('TRINIDAD')) {
$result['message'] = t('Protocol disabled.');
return $result;
}