diff options
| author | friendica <info@friendica.com> | 2015-02-13 13:05:14 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-13 13:05:14 -0800 |
| commit | 46eda6e72371fd5fb9e6810fd9ef68b659ffb308 (patch) | |
| tree | af6beb422bb70edf399b0f66103f88fae92bc3bf /include | |
| parent | 7bb2e25ea030b7c32d35766631d85ac24b192f11 (diff) | |
| parent | f0fe81df7983dbe5901c53b3c24fd30d35e0bcc7 (diff) | |
| download | volse-hubzilla-46eda6e72371fd5fb9e6810fd9ef68b659ffb308.tar.gz volse-hubzilla-46eda6e72371fd5fb9e6810fd9ef68b659ffb308.tar.bz2 volse-hubzilla-46eda6e72371fd5fb9e6810fd9ef68b659ffb308.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 1 | ||||
| -rwxr-xr-x | include/items.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/attach.php b/include/attach.php index 3350a591e..f973102e8 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1082,6 +1082,7 @@ function file_activity($channel_id, $object, $allow_cid, $allow_gid, $deny_cid, $arr['mid'] = $mid; $arr['parent_mid'] = $mid; $arr['item_flags'] = $item_flags; + $arr['item_unseen'] = 1; $arr['author_xchan'] = $poster['xchan_hash']; $arr['owner_xchan'] = $poster['xchan_hash']; $arr['title'] = ''; diff --git a/include/items.php b/include/items.php index 717a4bf71..18ce149ed 100755 --- a/include/items.php +++ b/include/items.php @@ -2861,7 +2861,7 @@ function tag_deliver($uid,$item_id) { if(preg_match($pattern,$body,$matches)) $tagged = true; - $pattern = '/@\!?\[zrl\=(.*?)\](.*?)\+\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; if(preg_match_all($pattern,$body,$matches,PREG_SET_ORDER)) { $max_forums = get_config('system','max_tagged_forums'); @@ -3022,7 +3022,7 @@ function tgroup_check($uid,$item) { // $pattern = '/@\!?\[zrl\=' . preg_quote($term['url'],'/') . '\]' . preg_quote($term['term'] . '+','/') . '\[\/zrl\]/'; - $pattern = '/@\!?\[zrl\=(.*?)\](.*?)\+\[\/zrl\]/'; + $pattern = '/@\!?\[zrl\=([^\]]*?)\]((?:.(?!\[zrl\=))*?)\+\[\/zrl\]/'; $found = false; |