diff options
| -rw-r--r-- | boot.php | 12 | ||||
| -rw-r--r-- | mod/item.php | 2 |
2 files changed, 12 insertions, 2 deletions
@@ -1298,10 +1298,18 @@ function activity_match($haystack,$needle) { }} +// Pull out all #hashtags and @person tags from $s; +// We also get @person@domain.com - which would make +// the regex quite complicated as tags can also +// end a sentence. So we'll run through our results +// and strip the period from any tags which end with one. +// Returns array of tags found, or empty array. + + if(! function_exists('get_tags')) { function get_tags($s) { $ret = array(); - if(preg_match_all('/([@#][^ ,:?]*)[ ,:?]/',$s,$match)) { + if(preg_match_all('/([@#][^ ,:?]*)([ ,:?]|$)/',$s,$match)) { foreach($match[1] as $match) { if(substr($match,-1,1) === '.') $ret[] = substr($match,0,-1); @@ -1314,6 +1322,8 @@ function get_tags($s) { }} +// quick and dirty quoted_printable encoding + if(! function_exists('qp')) { function qp($s) { return str_replace ("%","=",rawurlencode($s)); diff --git a/mod/item.php b/mod/item.php index 64a23e7fb..126f8b6a1 100644 --- a/mod/item.php +++ b/mod/item.php @@ -147,10 +147,10 @@ function item_post(&$a) { } } if($profile) { - $profile = str_replace(',','%2c',$profile); $body = str_replace($name,'[url=' . $profile . ']' . $name . '[/url]', $body); if(strlen($str_tags)) $str_tags .= ','; + $profile = str_replace(',','%2c',$profile); $str_tags .= '[url=' . $profile . ']' . $name . '[/url]'; } } |