diff options
Diffstat (limited to 'include')
-rwxr-xr-x | include/diaspora.php | 4 | ||||
-rwxr-xr-x | include/items.php | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/diaspora.php b/include/diaspora.php index 477f82914..c2f2b1ac9 100755 --- a/include/diaspora.php +++ b/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; } diff --git a/include/items.php b/include/items.php index 370dd5c72..b3b9d28cd 100755 --- a/include/items.php +++ b/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']), |