Don't assume the charset is specified - fallback to us-ascii if it isn't.

Doesn't anyone test variables before using them anymore?

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@5945 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index bb877878e7e6be389f54b98838ae99b779b7dbef..752aa3cfb04e424172deecbd554d39bfdd724b8b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -620,7 +620,12 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                 }
             }
            
-           $actual = $body_part_entity->header->parameters['charset'];
+           if (isset($body_part_entity->header->parameters['charset'])) {
+            $actual = $body_part_entity->header->parameters['charset'];
+        } else {
+            $actual = 'us-ascii';
+        }
+
            if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
                $bodypart = charset_decode($actual,$bodypart);
            }