aboutsummaryrefslogtreecommitdiffstats
path: root/include/bb2diaspora.php
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-18 18:07:38 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-18 18:07:38 +0100
commitbdfe2c77868afd59716103091b0dfa05060252d5 (patch)
tree83bb1d5522e2c12ea778c84879f269ab56d712c0 /include/bb2diaspora.php
parent68ecc673b109be50dc04cf72af8ce2296c70b86b (diff)
parent595be9919b0ce85087937985444477189381976c (diff)
downloadvolse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.gz
volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.tar.bz2
volse-hubzilla-bdfe2c77868afd59716103091b0dfa05060252d5.zip
Merge remote-tracking branch 'upstream/master'
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'];
}
}