Browse Source

Also cover "~"

Michael Hoffmann 9 years ago
parent
commit
5019404d23
2 changed files with 5 additions and 1 deletions
  1. 1 1
      src/View/Helper/TextHelper.php
  2. 4 0
      tests/TestCase/View/Helper/TextHelperTest.php

+ 1 - 1
src/View/Helper/TextHelper.php

@@ -123,7 +123,7 @@ class TextHelper extends Helper
                     (?<left>[\[<(]) # left paren,brace
                     (?>
                         # Lax match URL
-                        (?<url>(?:https?|ftp|nntp):\/\/[\p{L}0-9.\-_:]+(?:[\/?][\p{L}0-9.\-_:\/?=&>\[\]()#@\+]+)?)
+                        (?<url>(?:https?|ftp|nntp):\/\/[\p{L}0-9.\-_:]+(?:[\/?][\p{L}0-9.\-_:\/?=&>\[\]()#@\+~]+)?)
                         (?<right>[\])>]) # right paren,brace
                     )
                 )

+ 4 - 0
tests/TestCase/View/Helper/TextHelperTest.php

@@ -360,6 +360,10 @@ class TextHelperTest extends TestCase
             [
                 'http://dev.local/threads/search?search_string=this+is+a+test',
                 '<a href="http://dev.local/threads/search?search_string=this+is+a+test">http://dev.local/threads/search?search_string=this+is+a+test</a>'
+            ],
+            [
+                'http://www.ad.nl/show/giel-beelen-heeft-weinig-moeite-met-rijontzegging~acd8b6ed',
+                '<a href="http://www.ad.nl/show/giel-beelen-heeft-weinig-moeite-met-rijontzegging~acd8b6ed">http://www.ad.nl/show/giel-beelen-heeft-weinig-moeite-met-rijontzegging~acd8b6ed</a>'
             ]
         ];
     }