SOURCES: eventum-charset.patch - allow more than one subpart, just...

[glen]

Author: glen                         Date: Thu Sep  7 16:56:54 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- allow more than one subpart, just make sure first part ctype is text/*

---- Files affected:
SOURCES:
   eventum-charset.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/eventum-charset.patch
diff -u SOURCES/eventum-charset.patch:1.1 SOURCES/eventum-charset.patch:1.2
--- SOURCES/eventum-charset.patch:1.1	Wed Aug  9 01:08:33 2006
+++ SOURCES/eventum-charset.patch	Thu Sep  7 18:56:49 2006
@@ -2,15 +2,15 @@
 only one subpart, take the charset from that first part, rather from primary
 part.
 
---- eventum-20060725/include/class.mime_helper.php	2006-07-26 11:29:55.240578707 +0300
-+++ include/class.mime_helper.php	2006-07-26 14:20:18.000000000 +0300
+--- eventum-20060725/include/class.mime_helper.php	2006-07-26 14:20:18.000000000 +0300
++++ eventum-20060906/include/class.mime_helper.php	2006-09-07 18:06:03.000000000 +0300
 @@ -67,7 +67,13 @@
              return false;
          }
  
 -        $content_type = @$structure->headers['content-type'];
 +        if ($structure->ctype_primary == 'multipart' and $structure->ctype_secondary == 'mixed'
-+            and count($structure->parts) == 1) {
++            and count($structure->parts) >= 1 and $structure->parts[0]->ctype_primary == 'text') {
 +            $content_type = $structure->parts[0]->headers['content-type'];
 +        } else {
 +            $content_type = @$structure->headers['content-type'];
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eventum-charset.patch?r1=1.1&r2=1.2&f=u