From 39459c2d6514109fe37c0ecc25fcfcd15f10acc8 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 5 Jan 2015 18:22:15 -0800 Subject: undo these bits of trinidad - we're going to do things differently --- include/follow.php | 2 +- include/notifier.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/follow.php b/include/follow.php index b763321c2..1abd0e3b9 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')) || defined('TRINIDAD')) { + if(! intval(get_config('system','diaspora_enabled'))) { $result['message'] = t('Protocol disabled.'); return $result; } diff --git a/include/notifier.php b/include/notifier.php index f81963cf6..e1eb0c554 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') || defined('TRINIDAD')) + if(! get_config('system','diaspora_enabled')) continue; require_once('include/diaspora.php'); -- cgit v1.2.3