Changeset 674a0fb in github

Timestamp:

Nov 9, 2006 2:06:37 PM (7 years ago)

Author:

thomascube <thomas@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e4bbb24

Parents:

03ac213

Message:

Corrected template parsing and output encoding

Location:

program/include

Files:

• main.inc (modified) (1 diff)
• rcube_shared.inc (modified) (1 diff)

program/include/main.inc

@@ -959 +959 @@
     else if ($mode=='remove')
       $str = strip_tags($str);
-      
-    $out = strtr($str, $encode_arr);
+    
+    // avoid douple quotation of &
+    $out = preg_replace('/&([a-z]{2,5});/', '&\\1;', strtr($str, $encode_arr));
       
     return $newlines ? nl2br($out) : $out;

program/include/rcube_shared.inc

@@ -216 +216 @@
        ($fpos = strrpos($output_lc, '</html>')))
       {
-      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos,strlen($output));
+      $fpos -= 8;
+      $output = substr($output,0,$fpos) . "$__page_footer\n" . substr($output,$fpos);
       }
     else