diff options
| -rwxr-xr-x | boot.php | 3 | ||||
| -rw-r--r-- | include/follow.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | mod/receive.php | 2 |
4 files changed, 4 insertions, 5 deletions
@@ -45,8 +45,7 @@ require_once('include/Contact.php'); require_once('include/account.php'); -define ( 'RED_PLATFORM', 'trinidad' ); -define ( 'TRINIDAD', true ); +define ( 'RED_PLATFORM', 'redmatrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); 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'); diff --git a/mod/receive.php b/mod/receive.php index 6ee069365..b7d27d40f 100644 --- a/mod/receive.php +++ b/mod/receive.php @@ -12,7 +12,7 @@ function receive_post(&$a) { $enabled = intval(get_config('system','diaspora_enabled')); - if(! $enabled || defined('TRINIDAD')) { + if(! $enabled) { logger('mod-diaspora: disabled'); http_status_exit(500); } |