aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarijus <mario@mariovavti.com>2015-02-13 10:41:19 +0100
committermarijus <mario@mariovavti.com>2015-02-13 10:41:19 +0100
commitb340fd50953089cb835d91c8c6adeee95875a02c (patch)
tree6cf0553ce444ef6f844a9374120fd7086651e536
parent4616c13f3b324553f4320cb14306ec098eeeccfa (diff)
parent39b7faca9a4b987af7f332b1f39cd4eb544ce795 (diff)
downloadvolse-hubzilla-b340fd50953089cb835d91c8c6adeee95875a02c.tar.gz
volse-hubzilla-b340fd50953089cb835d91c8c6adeee95875a02c.tar.bz2
volse-hubzilla-b340fd50953089cb835d91c8c6adeee95875a02c.zip
Merge branch 'master' of https://github.com/friendica/red
-rwxr-xr-xinclude/items.php4
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;