[SM-CVS] SF.net SVN: squirrelmail:[14134] trunk/squirrelmail/functions/mime.php

[<ki...@us...>]

Revision: 14134
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14134&view=rev
Author:   kink
Date:     2011-07-13 08:44:04 +0000 (Wed, 13 Jul 2011)

Log Message:
-----------
attary may be empty at this point and the sq_fixatts call will generate PHP
Warnings. Wrap it in a conditional just like the other sq_fixatts call.

Modified Paths:
--------------
    trunk/squirrelmail/functions/mime.php

Modified: trunk/squirrelmail/functions/mime.php
===================================================================
--- trunk/squirrelmail/functions/mime.php	2011-07-13 08:36:01 UTC (rev 14133)
+++ trunk/squirrelmail/functions/mime.php	2011-07-13 08:44:04 UTC (rev 14134)
@@ -2350,15 +2350,17 @@
             list($free_content, $curpos) =
                 sq_fixstyle($body, $gt+1, $message, $id, $mailbox);
             if ($free_content != FALSE){
-                $attary = sq_fixatts($tagname,
-                                     $attary,
-                                     $rm_attnames,
-                                     $bad_attvals,
-                                     $add_attr_to_tag,
-                                     $message,
-                                     $id,
-                                     $mailbox
-                                     );
+                if ( !empty($attary) ) {
+                    $attary = sq_fixatts($tagname,
+                                         $attary,
+                                         $rm_attnames,
+                                         $bad_attvals,
+                                         $add_attr_to_tag,
+                                         $message,
+                                         $id,
+                                         $mailbox
+                                         );
+                }
                 $trusted .= sq_tagprint($tagname, $attary, $tagtype);
                 $trusted .= $free_content;
                 $trusted .= sq_tagprint($tagname, false, 2);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.