diff options
| -rwxr-xr-x | boot.php | 5 | ||||
| -rw-r--r-- | include/follow.php | 2 | ||||
| -rw-r--r-- | include/notifier.php | 2 | ||||
| -rw-r--r-- | mod/receive.php | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -45,7 +45,8 @@ require_once('include/Contact.php'); require_once('include/account.php'); -define ( 'RED_PLATFORM', 'redmatrix' ); +define ( 'RED_PLATFORM', 'trinidad' ); +define ( 'TRINIDAD', true ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); @@ -2198,4 +2199,4 @@ function z_get_temp_dir() { if(! $temp_dir) $temp_dir = sys_get_temp_dir(); return $upload_dir; -}
\ No newline at end of file +} 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'); diff --git a/mod/receive.php b/mod/receive.php index b7d27d40f..6ee069365 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) { + if(! $enabled || defined('TRINIDAD')) { logger('mod-diaspora: disabled'); http_status_exit(500); } |