aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/follow.php2
-rw-r--r--include/notifier.php2
2 files changed, 2 insertions, 2 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;
}
diff --git a/include/notifier.php b/include/notifier.php
index e1eb0c554..f81963cf6 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -564,7 +564,7 @@ function notifier_run($argv, $argc){
if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') {
- if(! get_config('system','diaspora_enabled'))
+ if(! get_config('system','diaspora_enabled') || defined('TRINIDAD'))
continue;
require_once('include/diaspora.php');