Commit ee29b23b authored by mmn's avatar mmn

Fix URL mention regular expression FOR REALZ

parent 48276556
...@@ -300,7 +300,9 @@ class OStatusPlugin extends Plugin ...@@ -300,7 +300,9 @@ class OStatusPlugin extends Plugin
static function extractUrlMentions($text) static function extractUrlMentions($text)
{ {
$wmatches = array(); $wmatches = array();
$result = preg_match_all('/(?:^|\s+)@('.URL_REGEX_DOMAIN_NAME.'(?:\/\w+)*)/', // In the regexp below we need to match / _before_ URL_REGEX_VALID_PATH_CHARS because it otherwise gets merged
// with the TLD before (but / is in URL_REGEX_VALID_PATH_CHARS anyway, it's just its positioning that is important)
$result = preg_match_all('/(?:^|\s+)@('.URL_REGEX_DOMAIN_NAME.'(?:\/['.URL_REGEX_VALID_PATH_CHARS.']*)*)/',
$text, $text,
$wmatches, $wmatches,
PREG_OFFSET_CAPTURE); PREG_OFFSET_CAPTURE);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment