diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-09-19 10:26:06 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-09-19 10:26:06 +0200 |
| commit | 105e7626fc2686c3d838e72350244408c439a9e8 (patch) | |
| tree | 69a93520d981f86f07e9da318ca2fbbc5d9f028a /include/feedutils.php | |
| parent | c3b3f41a21a5b56315768dbddc366934d6374c96 (diff) | |
| parent | c6bcea0f82a03657611621c338a6c01059ae8ec6 (diff) | |
| download | volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.tar.gz volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.tar.bz2 volse-hubzilla-105e7626fc2686c3d838e72350244408c439a9e8.zip | |
Merge remote-tracking branch 'mike/master' into dev
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, |