瀏覽代碼

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.

Thijs Kinkhorst 14 年之前
父節點
當前提交
2f36c7bb19
共有 1 個文件被更改,包括 11 次插入9 次删除
  1. 11 9
      functions/mime.php

+ 11 - 9
functions/mime.php

@@ -2350,15 +2350,17 @@ function sq_sanitize($body,
             list($free_content, $curpos) =
             list($free_content, $curpos) =
                 sq_fixstyle($body, $gt+1, $message, $id, $mailbox);
                 sq_fixstyle($body, $gt+1, $message, $id, $mailbox);
             if ($free_content != FALSE){
             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 .= sq_tagprint($tagname, $attary, $tagtype);
                 $trusted .= $free_content;
                 $trusted .= $free_content;
                 $trusted .= sq_tagprint($tagname, false, 2);
                 $trusted .= sq_tagprint($tagname, false, 2);