Commit 64b72a3c by Mikael Nordfeldth

New domain regexp for WebFinger matching.

1 parent 3453521c
......@@ -287,7 +287,7 @@ class OStatusPlugin extends Plugin
$wmatches = array();
// Webfinger matches: @user@example.com or even @user--one.george_orwell@1984.biz
if (preg_match_all('!(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
if (preg_match_all('/(?:^|\s+)@((?:\w+[\w\-\_\.]?)*(?:[\w\-\_\.]*\w+)@(?:(?!-)[A-Za-z0-9\-]{1,63}(?<!-)\.)+[A-Za-z]{2,10})/',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!