aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xinclude/items.php9
-rw-r--r--version.inc2
2 files changed, 10 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index d972a1ce9..c5fc14a09 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1581,6 +1581,15 @@ function get_atom_elements($feed,$item,&$author) {
$res['body'] = escape_tags($res['body']);
}
+ if(get_config('system','feedlinks')) {
+ if($res['plink'] && $res['title']) {
+ $res['body'] = '[url=' . $res['plink'] . ']' . $res['title'] . '[/url]' . "\n\n" . $res['body'];
+ }
+ elseif($res['plink']) {
+ $res['body'] = '[url]' . $res['plink'] . '[/url]' . "\n\n" . $res['body'];
+ }
+ }
+
$private = $item->get_item_tags(NAMESPACE_DFRN,'private');
if($private && intval($private[0]['data']) > 0)
$res['item_private'] = ((intval($private[0]['data'])) ? 1 : 0);
diff --git a/version.inc b/version.inc
index 05cba6305..f76b004a5 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-09-23.807
+2014-09-24.808