Просмотр исходного кода

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

Thijs Kinkhorst 19 лет назад
Родитель
Сommit
5cd6d8d00f
2 измененных файлов с 5 добавлено и 3 удалено
  1. 3 1
      ChangeLog
  2. 2 2
      functions/mime.php

+ 3 - 1
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)
 --------------------------------------

+ 2 - 2
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
 
-?>
+?>