aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-09-03 01:09:28 -0700
committerfriendica <info@friendica.com>2014-09-03 01:09:28 -0700
commit75d0f6329cc532c7f74927bdaa678d8d85f45a9e (patch)
tree43863c797d0bab2f4125a656b8b32013611d6a7c
parent5715d5f4c7a628c175fe9fea17210ca3151cd601 (diff)
downloadvolse-hubzilla-75d0f6329cc532c7f74927bdaa678d8d85f45a9e.tar.gz
volse-hubzilla-75d0f6329cc532c7f74927bdaa678d8d85f45a9e.tar.bz2
volse-hubzilla-75d0f6329cc532c7f74927bdaa678d8d85f45a9e.zip
outbound feed issue
-rwxr-xr-xinclude/diaspora.php4
-rwxr-xr-xinclude/items.php4
-rw-r--r--version.inc2
-rwxr-xr-xview/tpl/atom_feed.tpl1
4 files changed, 6 insertions, 5 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']),
diff --git a/version.inc b/version.inc
index fda7f617d..f8b14f55a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-02.786
+2014-09-03.787
diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl
index 2c8024d47..9e5b5a5be 100755
--- a/view/tpl/atom_feed.tpl
+++ b/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}}