Changeset 4142 in subversion

Timestamp:

Oct 27, 2010 2:25:13 AM (3 years ago)

Author:

alec

Message:

• Fix handling of URLs with semicolon (;) character (#1487088)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_string_replacer.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -52 +52 @@
 - Add support for selection options from LIST-EXTENDED extension (RFC 5258)
 - Don't list subscribed but non-existent folders (#1486225)
-- Fix handling of URLs with tilde (~) character (#1487087)
+- Fix handling of URLs with tilde (~) or semicolon (;) character (#1487087, #1487088)
 
 RELEASE 0.4.2

trunk/roundcubemail/program/include/rcube_string_replacer.php

@@ -38 +38 @@
     // Simplified domain expression for UTF8 characters handling
     $utf_domain = '[^?&@"\'\\/()\s\r\t\n]+\\.[a-z]{2,5}';
-    $url = '[a-z0-9%=#+?.:&\\/_~-]+';
+    $url = '[a-z0-9%=#@+?.:;&\\/_~-]+';
 
     $this->link_pattern = "/([\w]+:\/\/|\Wwww\.)($utf_domain($url)?)/i";
@@ -44 +44 @@
         ."[-\w!\#\$%&\'*+~\/^`|{}=]+(?:\.[-\w!\#\$%&\'*+~\/^`|{}=]+)*"  // local-part
         ."@$utf_domain"                                                 // domain-part
-        ."(\?$url)?"                                                     // e.g. ?subject=test...
+        ."(\?$url)?"                                                    // e.g. ?subject=test...
         .")/i";
   }