fix for multiple consecutive @ tags

diff --git a/include/text.php b/include/text.php
index 4726872ec299f4656770d8be29df5dac883093a2..59fc1500746a5f6b213efc4c3230b0564631a74c 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -465,7 +465,7 @@ function get_tags($s) {
        // Match full names against @tags including the space between first and last
        // We will look these up afterward to see if they are full names or not recognisable.
 
-       if(preg_match_all('/(@[^ \x0D\x0A,:?]+ [^ \x0D\x0A,:?]+)([ \x0D\x0A,:?]|$)/',$s,$match)) {
+       if(preg_match_all('/(@[^ \x0D\x0A,:?]+ [^ \x0D\x0A@,:?]+)([ \x0D\x0A@,:?]|$)/',$s,$match)) {
                foreach($match[1] as $mtch) {
                        if(strstr($mtch,"]")) {
                                // we might be inside a bbcode color tag - leave it alone

diff --git a/mod/item.php b/mod/item.php
index 48bfb7751fe9c7bd807d14713570ef90723333df..a03a8577549710389a4cde5a85e16d9e93bfcc04 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -378,6 +378,7 @@ function item_post(&$a) {
 
        if(count($tags)) {
                foreach($tags as $tag) {
+                       
                        if(isset($profile))
                                unset($profile);
                        if(strpos($tag,'#') === 0) {