Fixes #1853 matching UTF8 characters in usernames

diff --git a/mod/thewire/start.php b/mod/thewire/start.php
index 202e3d1d62ee31f6c7805dba7dc4048ce54f5b5a..fdaf91355bb03d806ca42ae3e244076d7f8a73c1 100644 (file)
--- a/mod/thewire/start.php
+++ b/mod/thewire/start.php
@@ -219,7 +219,7 @@ function thewire_filter($text) {
 
        // usernames
        $text = preg_replace(
-                               '/(^|[^\w])@([\w.]+)/',
+                               '/(^|[^\w])@([\p{L}\p{Nd}._]+)/u',
                                '$1<a href="' . $CONFIG->wwwroot . 'thewire/owner/$2">@$2</a>',
                                $text);
 

diff --git a/mod/thewire/tests/regex.php b/mod/thewire/tests/regex.php
index f5487a422c283f89bc1ac132540d54cae50db8ea..c73e06bdc4570ed69d8b58d9ee570f6b4153e84f 100644 (file)
--- a/mod/thewire/tests/regex.php
+++ b/mod/thewire/tests/regex.php
@@ -127,6 +127,12 @@ class TheWireRegexTest extends ElggCoreUnitTest {
                $expected = "test (" . $this->getUserWireLink('user') . ") test";
                $result = thewire_filter($text);
                $this->assertEqual($result, $expected);
+
+               // utf8 characters
+               $text = "@tyúkanyó";
+               $expected = $this->getUserWireLink('tyúkanyó');
+               $result = thewire_filter($text);
+               $this->assertEqual($result, $expected);
        }
 
        /**