fix for multiple consecutive @ tags

This commit is contained in:
Friendika 2011-11-02 21:07:17 -07:00
parent 3ca41fc3bd
commit bd48a016af
2 changed files with 2 additions and 1 deletions

View File

@ -465,7 +465,7 @@ function get_tags($s) {
// Match full names against @tags including the space between first and last // 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. // 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) { foreach($match[1] as $mtch) {
if(strstr($mtch,"]")) { if(strstr($mtch,"]")) {
// we might be inside a bbcode color tag - leave it alone // we might be inside a bbcode color tag - leave it alone

View File

@ -378,6 +378,7 @@ function item_post(&$a) {
if(count($tags)) { if(count($tags)) {
foreach($tags as $tag) { foreach($tags as $tag) {
if(isset($profile)) if(isset($profile))
unset($profile); unset($profile);
if(strpos($tag,'#') === 0) { if(strpos($tag,'#') === 0) {