Bug #9927: Don't treat subject as an address containing header

horde · Apr 19, 2011 · 84fae3c · 84fae3c
1 parent 3f61382
commit 84fae3c
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/imp/compose.php b/imp/compose.php
@@ -629,12 +629,16 @@
     $header['bcc'] = Horde_Mime_Address::addrArray2String($identity->getBccAddresses());
 }
 
-foreach (array('to', 'cc', 'bcc', 'subject') as $val) {
+foreach (array('to', 'cc', 'bcc') as $val) {
     if (!isset($header[$val])) {
         $header[$val] = $imp_ui->getAddressList($vars->$val);
     }
 }
 
+if (!isset($header['subject'])) {
+    $header['subject'] = $vars->subject;
+}
+
 /* If PGP encryption is set by default, and we have a recipient list on first
  * load, make sure we have public keys for all recipients. */
 $encrypt_options = $prefs->isLocked('default_encrypt')