diff options
author | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
---|---|---|
committer | zotlabs <mike@macgirvin.com> | 2017-09-24 16:59:56 -0700 |
commit | 8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c (patch) | |
tree | 04add36aa35ce8cda58c5594a783737b25346175 /include/feedutils.php | |
parent | 4d3b0577c9538644ca0eeb2751b285521d2cc86d (diff) | |
parent | 866dc9a9b3ca1cd98fc032afe0aec14ccdb86ba0 (diff) | |
download | volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.gz volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.tar.bz2 volse-hubzilla-8b7ab90836ef313e7eaf0a3fd1f29ad8ab1a716c.zip |
Merge branch 'master' into tagging
Diffstat (limited to 'include/feedutils.php')
-rw-r--r-- | include/feedutils.php | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/feedutils.php b/include/feedutils.php index 145d4361c..112e10155 100644 --- a/include/feedutils.php +++ b/include/feedutils.php @@ -811,6 +811,7 @@ function feed_get_reshare(&$res,$item) { } $attach = $share['links']; + if($attach) { foreach($attach as $att) { if($att['rel'] === 'alternate') { @@ -845,6 +846,10 @@ function feed_get_reshare(&$res,$item) { } } + if((! $body) && ($share['alternate'])) { + $body = $share['alternate']; + } + $res['body'] = "[share author='" . urlencode($share['author']) . "' profile='" . $share['profile'] . "' avatar='" . $share['avatar'] . @@ -1706,7 +1711,7 @@ function compat_photos_list($s) { $found = preg_match_all('/\[[zi]mg(.*?)\](.*?)\[/ism',$s,$matches,PREG_SET_ORDER); if($found) { - foreach($matches as $match) { + foreach($matches as $match) { $ret[] = [ 'href' => $match[2], 'length' => 0, |