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/items.php | |
| 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/items.php')
| -rwxr-xr-x | include/items.php | 3 |
1 files changed, 3 insertions, 0 deletions
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) |