diff options
| author | friendica <info@friendica.com> | 2015-01-05 18:22:15 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-05 18:22:15 -0800 |
| commit | 39459c2d6514109fe37c0ecc25fcfcd15f10acc8 (patch) | |
| tree | bf625cf4c59bf521e639018399bf1770d116a6a0 /include | |
| parent | 2dca165f9b0a80ceca562a132868c9f934822f3e (diff) | |
| download | volse-hubzilla-39459c2d6514109fe37c0ecc25fcfcd15f10acc8.tar.gz volse-hubzilla-39459c2d6514109fe37c0ecc25fcfcd15f10acc8.tar.bz2 volse-hubzilla-39459c2d6514109fe37c0ecc25fcfcd15f10acc8.zip | |
undo these bits of trinidad - we're going to do things differently
Diffstat (limited to 'include')
| -rw-r--r-- | include/follow.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 2 |
2 files changed, 2 insertions, 2 deletions
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'); |