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

outbound feed issue

Browse Source
This commit is contained in:
friendica 2014-09-03 01:09:28 -07:00
parent 5715d5f4c7
commit 75d0f6329c
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/diaspora.php
View File

@ -2568,8 +2568,8 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
// Author signature information (for likes, comments, and retractions of likes or comments, // Author signature information (for likes, comments, and retractions of likes or comments,
// whether from Diaspora or Friendica) must be placed in the `sign` table before this // whether from Diaspora or Friendica) must be placed in the `sign` table before this
// function is called // function is called
$authorsig = $item['sig']; // $authorsig = $item['sig'];
logger('diaspora_send_relay: original author signature not found, cannot send relayable'); logger('diaspora_send_relay: original author signature not found');
// ignore - see below // ignore - see below
// return; // return;
} }

4
include/items.php
View File

@ -518,13 +518,13 @@ function get_feed_for($channel, $observer_hash, $params) {
$atom .= replace_macros($feed_template, array( $atom .= replace_macros($feed_template, array(
'$version' => xmlify(RED_VERSION), '$version' => xmlify(RED_VERSION),
'$red' => xmlify(RED_PLATFORM), '$red' => xmlify(RED_PLATFORM),
'$feed_id' => xmlify($channel['channel_url']), '$feed_id' => xmlify($channel['xchan_url']),
'$feed_title' => xmlify($channel['channel_name']), '$feed_title' => xmlify($channel['channel_name']),
'$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) , '$feed_updated' => xmlify(datetime_convert('UTC', 'UTC', 'now' , ATOM_TIME)) ,
'$hub' => '', // feed_hublinks(), '$hub' => '', // feed_hublinks(),
'$salmon' => '', // feed_salmonlinks($channel['channel_address']), '$salmon' => '', // feed_salmonlinks($channel['channel_address']),
'$name' => xmlify($channel['channel_name']), '$name' => xmlify($channel['channel_name']),
'$profile_page' => xmlify($channel['channel_url']), '$profile_page' => xmlify($channel['xchan_url']),
'$mimephoto' => xmlify($channel['xchan_photo_mimetype']), '$mimephoto' => xmlify($channel['xchan_photo_mimetype']),
'$photo' => xmlify($channel['xchan_photo_l']), '$photo' => xmlify($channel['xchan_photo_l']),
'$thumb' => xmlify($channel['xchan_photo_m']), '$thumb' => xmlify($channel['xchan_photo_m']),

2
version.inc
View File

@ -1 +1 @@
2014-09-02.786 2014-09-03.787

1
view/tpl/atom_feed.tpl
View File

@ -15,6 +15,7 @@
<title>{{$feed_title}}</title> <title>{{$feed_title}}</title>
<generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator> <generator uri="http://getzot.com" version="{{$version}}">{{$red}}</generator>
<link rel="license" href="http://creativecommons.org/licenses/by/3.0/" /> <link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
<link rel="alternate" type="text/html" href="{{$profile_page}}" />
{{if $hub}} {{if $hub}}
{{$hub}} {{$hub}}
{{/if}} {{/if}}