diff options
| author | friendica <info@friendica.com> | 2014-09-03 05:09:43 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-09-03 05:09:43 -0700 |
| commit | e8ef515b6136ee79ff17e1c143a15e29691d3d81 (patch) | |
| tree | d81e295924df1c4c9c792c4a25306b4eed16bc56 /mod/xrd.php | |
| parent | 75d0f6329cc532c7f74927bdaa678d8d85f45a9e (diff) | |
| download | volse-hubzilla-e8ef515b6136ee79ff17e1c143a15e29691d3d81.tar.gz volse-hubzilla-e8ef515b6136ee79ff17e1c143a15e29691d3d81.tar.bz2 volse-hubzilla-e8ef515b6136ee79ff17e1c143a15e29691d3d81.zip | |
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.
Diffstat (limited to 'mod/xrd.php')
| -rw-r--r-- | mod/xrd.php | 17 |
1 files changed, 5 insertions, 12 deletions
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']); |