outbound feed issue

include/diaspora.php

@@ -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,
 		// whether from Diaspora or Friendica) must be placed in the `sign` table before this 
 		// function is called
-		$authorsig = $item['sig'];
-		logger('diaspora_send_relay: original author signature not found, cannot send relayable');
+//		$authorsig = $item['sig'];
+		logger('diaspora_send_relay: original author signature not found');
 // ignore - see below
 //		return;
 	}

include/items.php

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

version.inc

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

view/tpl/atom_feed.tpl

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