aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-05-09 17:09:38 -0700
committerzotlabs <mike@macgirvin.com>2018-05-09 17:09:38 -0700
commit50796079fa0f129b0fd084e80f345837dccee0e3 (patch)
tree5e3af522d9c3ef722de78aea8c60e44e384f601e
parent9acf007687d58a0e4fe1f1b348e668c3329655f7 (diff)
downloadvolse-hubzilla-50796079fa0f129b0fd084e80f345837dccee0e3.tar.gz
volse-hubzilla-50796079fa0f129b0fd084e80f345837dccee0e3.tar.bz2
volse-hubzilla-50796079fa0f129b0fd084e80f345837dccee0e3.zip
loose ends discovered while fixing hubzilla #1166
-rw-r--r--include/text.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text.php b/include/text.php
index 5be44c3cb..681103389 100644
--- a/include/text.php
+++ b/include/text.php
@@ -816,7 +816,7 @@ function get_tags($s) {
// match any double quoted tags
- if(preg_match_all('/([@#!]\&quot\;.*?\&quot\;)/',$s,$match)) {
+ if(preg_match_all('/([@#\!]\&quot\;.*?\&quot\;)/',$s,$match)) {
foreach($match[1] as $mtch) {
$ret[] = $mtch;
}
@@ -833,7 +833,7 @@ function get_tags($s) {
// Pull out single word tags. These can be @nickname, @first_last
// 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) {
if(substr($mtch,-1,1) === '.')
$mtch = substr($mtch,0,-1);