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

2015-01-05 18:22:15 -08:00
parent 2dca165f9b
commit 39459c2d65
4 changed files with 4 additions and 5 deletions
@@ -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;
 			}