Changeset 4996

Timestamp:

08/26/11 13:54:32 (13 years ago)

Author:

roberto.santosjunior

Message:

Ticket #1820 - Formatação de parte do texto incide sobre todo o restante da mensagem.r4977

Location:

trunk/expressoMail1_2

Files:

• inc/class.imap_functions.inc.php (modified) (1 diff)
• js/draw_api.js (modified) (1 diff)

trunk/expressoMail1_2/inc/class.imap_functions.inc.php

@@ -1511 +1511 @@
 
                 //Remoção de tags <span></span> para correção de erro no firefox
-                if($_SESSION['phpgw_session']['phpgw_app_sessions']['phpgwapi']['browser_agent']['content'] != 'IE'){
-                    $body = mb_eregi_replace("<span><span>","",$body);
-                    $body = mb_eregi_replace("</span></span>","",$body);
-                }
-                
+//               if($_SESSION['phpgw_session']['phpgw_app_sessions']['phpgwapi']['browser_agent']['content'] != 'IE'){
+//                   $body = mb_eregi_replace("<span><span>","",$body);
+//                   $body = mb_eregi_replace("</span></span>","",$body);
+//               }
+
                 $body = mb_ereg_replace("(<p[^>]*)(text-indent:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body);
                 $body = mb_ereg_replace("(<p[^>]*)(margin-right:[^>;]*-[^>;]*;)([^>]*>)","\\1\\3",$body);

trunk/expressoMail1_2/js/draw_api.js

@@ -2437 +2437 @@
         newBody = newBody.replace("<body","<span");
         newBody = newBody.replace("<BODY","<span");
-        while ( ( /<span[^>]*><span[^>]*>/ig ).test( newBody ) )
-                newBody = newBody.replace( /(<span[^>]*>)<span[^>]*>/ig, '$1' );
+        //while ( ( /<span[^>]*><span[^>]*>/ig ).test( newBody ) )
+        //       newBody = newBody.replace( /(<span[^>]*>)<span[^>]*>/ig, '$1' );
 
         var _body = document.createElement( 'div' );