Fixes a few issues

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index bb877878e7e6be389f54b98838ae99b779b7dbef..466bbfa1337289a113a9fe2645980cfd82a31a2c 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -15,9 +15,10 @@
  *    - Save As Draft
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -620,7 +621,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);
            }