diff options
| author | Brion Vibber <brion@pobox.com> | 2010-05-18 13:21:23 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-05-18 13:21:23 -0700 |
| commit | d5b4df4097c2d64e52f249042038ddbf99769b6c (patch) | |
| tree | ecca2b3082d0c88bb0924bfba56ea23ce0ec402a /plugins/OStatus | |
| parent | 6da59fab58b3f517a9e48204faa4f29ceabc4ba9 (diff) | |
| parent | b77878f46729d48588fb32b8a54ae13f3752c558 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'plugins/OStatus')
| -rw-r--r-- | plugins/OStatus/OStatusPlugin.php | 2 | ||||
| -rw-r--r-- | plugins/OStatus/lib/discoveryhints.php | 1 |
2 files changed, 2 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)) { diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php index 80cfbbf15..ca54a0f5f 100644 --- a/plugins/OStatus/lib/discoveryhints.php +++ b/plugins/OStatus/lib/discoveryhints.php @@ -30,6 +30,7 @@ class DiscoveryHints { case Discovery::PROFILEPAGE: $hints['profileurl'] = $link['href']; break; + case Salmon::NS_MENTIONS: case Salmon::NS_REPLIES: $hints['salmon'] = $link['href']; break; |