initial trinidad checkin

2014-12-29 23:48:04 -08:00
parent 50943f439c
commit 5cfe051139
4 changed files with 5 additions and 4 deletions
--- 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;
 			}