diff options
| author | RedMatrix <info@friendica.com> | 2015-02-13 20:28:07 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-02-13 20:28:07 +1100 |
| commit | 39b7faca9a4b987af7f332b1f39cd4eb544ce795 (patch) | |
| tree | 43f3489d5e81fea63cc597f081f50f38d18fad66 /include | |
| parent | fb198b8a058b7a9f4a1730a7cb44c3aeac745925 (diff) | |
| parent | 8696795ce69ee50c7a4e63f5a7e740de466f5df6 (diff) | |
| download | volse-hubzilla-39b7faca9a4b987af7f332b1f39cd4eb544ce795.tar.gz volse-hubzilla-39b7faca9a4b987af7f332b1f39cd4eb544ce795.tar.bz2 volse-hubzilla-39b7faca9a4b987af7f332b1f39cd4eb544ce795.zip | |
Merge pull request #897 from solstag/tagfix
Fixes tag delivery regex for when multiple tags are present
Diffstat (limited to 'include')
| -rwxr-xr-x | include/items.php | 4 |
1 files changed, 2 insertions, 2 deletions
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; |