harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

undo these bits of trinidad - we're going to do things differently

Browse Source
This commit is contained in:
friendica 2015-01-05 18:22:15 -08:00
parent 2dca165f9b
commit 39459c2d65
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
boot.php
View File

@ -45,8 +45,7 @@ require_once('include/Contact.php');
require_once('include/account.php'); require_once('include/account.php');
define ( 'RED_PLATFORM', 'trinidad' ); define ( 'RED_PLATFORM', 'redmatrix' );
define ( 'TRINIDAD', true );
define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R');
define ( 'ZOT_REVISION', 1 ); define ( 'ZOT_REVISION', 1 );

2
include/follow.php
View File

@ -131,7 +131,7 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false)
} }
else { else {
if(! ($is_http)) { if(! ($is_http)) {
if(! intval(get_config('system','diaspora_enabled')) || defined('TRINIDAD')) { if(! intval(get_config('system','diaspora_enabled'))) {
$result['message'] = t('Protocol disabled.'); $result['message'] = t('Protocol disabled.');
return $result; return $result;
} }

2
include/notifier.php
View File

@ -564,7 +564,7 @@ function notifier_run($argv, $argc){
if($hub['hubloc_network'] === 'diaspora' || $hub['hubloc_network'] === 'friendica-over-diaspora') { 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; continue;
require_once('include/diaspora.php'); require_once('include/diaspora.php');

2
mod/receive.php
View File

@ -12,7 +12,7 @@ function receive_post(&$a) {
$enabled = intval(get_config('system','diaspora_enabled')); $enabled = intval(get_config('system','diaspora_enabled'));
if(! $enabled || defined('TRINIDAD')) { if(! $enabled) {
logger('mod-diaspora: disabled'); logger('mod-diaspora: disabled');
http_status_exit(500); http_status_exit(500);
} }