aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorPaolo T <tuscanhobbit@users.noreply.github.com>2014-09-18 08:41:41 +0200
committerPaolo T <tuscanhobbit@users.noreply.github.com>2014-09-18 08:41:41 +0200
commit7da97c198182f8f6f4286e16d80de205431d81bb (patch)
treed03c22c98fa5e522fef874554be307969154c792 /include/bb2diaspora.php
parent4f793069bf4aafcfe77d50e47690173104ef23c7 (diff)
parent0b47fb9a91b58147e616ea75a23dea0d431c40f8 (diff)
downloadvolse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.gz
volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.tar.bz2
volse-hubzilla-7da97c198182f8f6f4286e16d80de205431d81bb.zip
Merge pull request #3 from friendica/master
Merge from upstream
Diffstat (limited to 'include/bb2diaspora.php')
-rw-r--r--include/bb2diaspora.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 846725639..e60f72add 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -269,12 +269,12 @@ function bb2diaspora_itemwallwall(&$item) {
logger('bb2diaspora_itemwallwall: author: ' . print_r($item['author'],true), LOGGER_DEBUG);
}
- if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author'])) && $item['author']['url'] && $item['author']['name'] && $item['author']['photo']['src']) {
+ if(($item['mid'] == $item['parent_mid']) && ($item['author_xchan'] != $item['owner_xchan']) && (is_array($item['author'])) && $item['author']['xchan_url'] && $item['author']['xchan_name'] && $item['author']['xchan_photo_m']) {
logger('bb2diaspora_itemwallwall: wall to wall post',LOGGER_DEBUG);
// post will come across with the owner's identity. Throw a preamble onto the post to indicate the true author.
$item['body'] = "\n\n"
- . '[img]' . $item['author']['photo']['src'] . '[/img]'
- . '[url=' . $item['author']['url'] . ']' . $item['author']['name'] . '[/url]' . "\n\n"
+ . '[img]' . $item['author']['xchan_photo_m'] . '[/img]'
+ . '[url=' . $item['author']['xchan_url'] . ']' . $item['author']['xchan_name'] . '[/url]' . "\n\n"
. $item['body'];
}
}