From e8ef515b6136ee79ff17e1c143a15e29691d3d81 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Wed, 3 Sep 2014 05:09:43 -0700
Subject: store diaspora meta info in the item table. It has to go there or it
 will kill us with complex joins. We can phase out the sign table once this
 all checks out.

---
 mod/xrd.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

(limited to 'mod/xrd.php')

diff --git a/mod/xrd.php b/mod/xrd.php
index d059bec9b..4fa81c7f3 100644
--- a/mod/xrd.php
+++ b/mod/xrd.php
@@ -22,18 +22,11 @@ function xrd_init(&$a) {
 	if(! $r) 
 		killme();
 
-	if(get_config('system','diaspora_enabled')) {
-		$tpl = get_markup_template('xrd_diaspora.tpl');
-		$dspr = replace_macros($tpl,array(
-			'$baseurl' => $a->get_baseurl(),
-			'$dspr_guid' => $r[0]['channel_guid'],
-			'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
-		));
-	}
-	else
-		$dspr = '';
-
-
+	$dspr = replace_macros(get_markup_template('xrd_diaspora.tpl'),array(
+		'$baseurl' => $a->get_baseurl(),
+		'$dspr_guid' => $r[0]['channel_guid'],
+		'$dspr_key' => base64_encode(pemtorsa($r[0]['channel_pubkey']))
+	));
 
 	$salmon_key = salmon_key($r[0]['channel_pubkey']);
 
-- 
cgit v1.2.3