summaryrefslogtreecommitdiff
path: root/plugins/OStatus/OStatusPlugin.php
diff options
context:
space:
mode:
authorJames Walker <walkah@walkah.net>2010-05-14 16:41:29 -0400
committerJames Walker <walkah@walkah.net>2010-05-14 16:43:41 -0400
commit275002d88a758d47e15b2f6d97873c243a500451 (patch)
treea74442053952c9d6b6f7476683519de3a259519b /plugins/OStatus/OStatusPlugin.php
parent2e808fdc82adc862be12118332d27a36a19123ca (diff)
allow hyphens in subdomains for webfinger addresses
Diffstat (limited to 'plugins/OStatus/OStatusPlugin.php')
-rw-r--r--plugins/OStatus/OStatusPlugin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index f183bc7ae..5167842ca 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -257,7 +257,7 @@ class OStatusPlugin extends Plugin
$matches = array();
// Webfinger matches: @user@example.com
- if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
+ if (preg_match_all('!(?:^|\s+)@((?:\w+\.)*\w+@(?:\w+\-?\w+\.)*\w+(?:\w+\-\w+)*\.\w+)!',
$text,
$wmatches,
PREG_OFFSET_CAPTURE)) {