loose ends discovered while fixing hubzilla #1166
This commit is contained in:
parent
9acf007687
commit
50796079fa
@ -816,7 +816,7 @@ function get_tags($s) {
|
|||||||
|
|
||||||
// match any double quoted tags
|
// match any double quoted tags
|
||||||
|
|
||||||
if(preg_match_all('/([@#!]\"\;.*?\"\;)/',$s,$match)) {
|
if(preg_match_all('/([@#\!]\"\;.*?\"\;)/',$s,$match)) {
|
||||||
foreach($match[1] as $mtch) {
|
foreach($match[1] as $mtch) {
|
||||||
$ret[] = $mtch;
|
$ret[] = $mtch;
|
||||||
}
|
}
|
||||||
@ -833,7 +833,7 @@ function get_tags($s) {
|
|||||||
// Pull out single word tags. These can be @nickname, @first_last
|
// Pull out single word tags. These can be @nickname, @first_last
|
||||||
// and #hash tags.
|
// and #hash tags.
|
||||||
|
|
||||||
if(preg_match_all('/(?<![a-zA-Z0-9=\pL\/\?\;])([@#\!][^ \x0D\x0A,;:?\[]+)/u',$s,$match)) {
|
if(preg_match_all('/(?<![a-zA-Z0-9=\pL\/\?\;])([@#\!][^ \x0D\x0A,;:\?\[\{\&]+)/u',$s,$match)) {
|
||||||
foreach($match[1] as $mtch) {
|
foreach($match[1] as $mtch) {
|
||||||
if(substr($mtch,-1,1) === '.')
|
if(substr($mtch,-1,1) === '.')
|
||||||
$mtch = substr($mtch,0,-1);
|
$mtch = substr($mtch,0,-1);
|
||||||
|
Reference in New Issue
Block a user