[squirrelmail] fix possible php warning

[Michal Hlavinka]

commit d5254ab8689f7920b0451505eb6deaa7b6b5654f
Author: Michal Hlavinka <mhlavink at redhat.com>
Date:   Wed Jul 13 11:13:04 2011 +0200

    fix possible php warning

 squirrelmail-1.4.22-prfix.patch |   30 ++++++++++++++++++++++++++++++
 squirrelmail.spec               |    9 ++++++++-
 2 files changed, 38 insertions(+), 1 deletions(-)
---
diff --git a/squirrelmail-1.4.22-prfix.patch b/squirrelmail-1.4.22-prfix.patch
new file mode 100644
index 0000000..2a5babc
--- /dev/null
+++ b/squirrelmail-1.4.22-prfix.patch
@@ -0,0 +1,30 @@
+--- squirrelmail/functions/mime.php.orig	2011-07-12 22:21:59 UTC (rev 14132)
++++ squirrelmail/functions/mime.php	2011-07-13 08:36:01 UTC (rev 14133)
+@@ -2159,15 +2159,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);
+
diff --git a/squirrelmail.spec b/squirrelmail.spec
index e7e17a1..e4cd6c8 100644
--- a/squirrelmail.spec
+++ b/squirrelmail.spec
@@ -6,7 +6,7 @@
 Summary: webmail client written in php
 Name: squirrelmail
 Version: 1.4.22
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 URL: http://www.squirrelmail.org/
 Group: Applications/Internet
@@ -33,6 +33,9 @@ Patch4: squirrelmail-1.4.17-biguid.patch
 # bug #508631 - use hunspell instead of aspell
 Patch5: squirrelmail-1.4.19-hunspell.patch
 
+# fix issues found post release
+Patch6: squirrelmail-1.4.22-prfix.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: gettext
@@ -53,6 +56,7 @@ easy to configure and install.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 mkdir locale_tempdir
 pushd locale_tempdir
@@ -264,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/cron.daily/squirrelmail.cron
 
 %changelog
+* Wed Jul 13 2011 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-2
+- fix possible php warning
+
 * Wed Jul 13 2011 Michal Hlavinka <mhlavink at redhat.com> - 1.4.22-1
 - squirrelmail updated to 1.4.22
 - fixes CVE-2010-4554, CVE-2010-4555, CVE-2011-2023