diff options
| author | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-09-19 13:09:19 -0700 |
| commit | 51e40add661219c26c73f4b8d6da1f691e0b9b6d (patch) | |
| tree | 6ce7fcce4ead9110c67eecd08be652b07350ccb5 /include | |
| parent | 8123a62302330cc8629d0c8ecb68d3d3be07a005 (diff) | |
| parent | 4500faf463e7fd6fcf9948666421c941a1292df9 (diff) | |
| download | volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.gz volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.tar.bz2 volse-hubzilla-51e40add661219c26c73f4b8d6da1f691e0b9b6d.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/feedutils.php | 7 | ||||
| -rwxr-xr-x | include/items.php | 3 |
2 files changed, 9 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, diff --git a/include/items.php b/include/items.php index f286015fe..daf41aa4b 100755 --- a/include/items.php +++ b/include/items.php @@ -2498,6 +2498,9 @@ function tag_deliver($uid, $item_id) { $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; + // statusnet style group tags + $pattern2 = '/^|[^@]\!\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; + if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) { $max_forums = get_config('system','max_tagged_forums'); if(! $max_forums) |