Merge pull request #30 from Garfield-fr/allow_comma

Allow commas in URLs
liip · Dec 11, 2015 · 536dd00 · 536dd00
2 parents 2f7c3e0 + 3bc6fe8
commit 536dd00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Extension/UrlAutoConverterTwigExtension.php b/Extension/UrlAutoConverterTwigExtension.php
@@ -61,7 +61,7 @@ public function getFilters()
      */
     public function autoConvertUrls($string)
     {
-        $pattern = '/(href="|src=")?([-a-zA-Zа-яёА-ЯЁ0-9@:%_\+.~#?&\/\/=]{2,256}\.[a-zа-яё]{2,4}\b(\/?[-\p{L}0-9@:%_\+.~#?&\/\/=\(\)]*)?)/u';
+        $pattern = '/(href="|src=")?([-a-zA-Zа-яёА-ЯЁ0-9@:%_\+.~#?&\/\/=]{2,256}\.[a-zа-яё]{2,4}\b(\/?[-\p{L}0-9@:%_\+.~#?&\/\/=\(\),]*)?)/u';
         $stringFiltered = preg_replace_callback($pattern, array($this, 'callbackReplace'), $string);
 
         return $stringFiltered;

diff --git a/Tests/Extension/UrlAutoConverterTwigExtensionTest.php b/Tests/Extension/UrlAutoConverterTwigExtensionTest.php
@@ -134,6 +134,10 @@ public function provider()
                 'Lorem ipsum dolor sit amet, <a href="http://тест.рф" class="" target="">http://тест.рф</a> consectetuer.',
                 'Lorem ipsum dolor sit amet, http://тест.рф consectetuer.',
             ),
+            array(
+                'Lorem ipsum dolor sit amet, <a href="http://test.com/foo,_bar" class="" target="">http://test.com/foo,_bar</a> consectetuer.',
+                'Lorem ipsum dolor sit amet, http://test.com/foo,_bar consectetuer.',
+            ),
         );
     }