- Fix MagicHTML fix with respect to parsing of u\rl in IE.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@10812 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/ChangeLog b/ChangeLog
index d1bd969bdba6512452f6d9dc68cca81da50d4dc5..09903a8986eb015c706d9c542007b361b8e48ca2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,10 +2,12 @@
 *** SquirrelMail Devel Series 1.5 ***
 *************************************
 
-Version 1.5.2 CVS
+Version 1.5.2 - CVS
+-------------------
   - Fix warning about array required in array_keys for display options when no
     fontset is defined.
   - Added "bad plugin" blacklist in configtest.php.
+  - Fix MagicHTML fix with respect to parsing of u\rl in IE.
        
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/mime.php b/functions/mime.php
index 158d0bcf87b1a0077ad26169780f51862b56fb1f..bed523a7d1c3cb1782dbeb8fe034dd1ef67fca73 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -1701,7 +1701,7 @@ function sq_fixstyle($body, $pos, $message, $id, $mailbox){
     //                           "url(\\1$secremoveimg\\2)", $content);
     // remove NUL
     $content = str_replace("\0", "", $content);
-
+    $content = preg_replace("/(\\\\)?u(\\\\)?r(\\\\)?l(\\\\)?/",'url', $content);
     // NB I insert NUL characters to keep to avoid an infinite loop. They are removed after the loop.
     while (preg_match("/url\s*\(\s*[\'\"]?([^:]+):(.*)?[\'\"]?\s*\)/si", $content, $matches)) {
         $sProto = strtolower($matches[1]);
@@ -2387,4 +2387,4 @@ function SendDownloadHeaders($type0, $type1, $filename, $force, $filesize=0) {
 
 }  // end fn SendDownloadHeaders
 
-?>
\ No newline at end of file
+?>