Fix for resume on draft breaking From: being a different identity.

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

diff --git a/src/compose.php b/src/compose.php
index 049b40a0f708001ae2a18e10254473b92ef5e143..7f1d6809b9b2654037e7f77feb5356a3edf2bfb8 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -663,6 +663,11 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
 
         $identity = '';
         $from_o = $orig_header->from;
+        if (is_array($from_o)) {
+            if (isset($from_o[0])) {
+                $from_o = $from_o[0];
+            }
+        }
         if (is_object($from_o)) {
             $orig_from = $from_o->getAddress();
         } else {
@@ -684,8 +689,6 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
             if ($identity_match) {
                 $identity = $identity_match;
             }
-        // we need identiy here fore draft case #845290
-        // echo $identity."leer";
         }
 
         switch ($action) {