extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix missing signature when attaching signature after compose, before send

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-20 10:31:18 +00:00
parent 09622e4454
commit 32f75929af
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_compose.inc.php
View File

@ -2035,7 +2035,7 @@ class mail_compose
}
$disableRuler = false;
#if ($realCharset != $this->displayCharset) error_log("Error: bocompose::createMessage found Charset ($realCharset) differs from DisplayCharset (".$this->displayCharset.")");
$signature = $_signature->fm_signature;
$signature = $_signature[ident_signature];
if ((isset($this->preferencesArray['insertSignatureAtTopOfMessage']) && $this->preferencesArray['insertSignatureAtTopOfMessage']))
{
@ -2312,7 +2312,8 @@ class mail_compose
$signature=array();
}
//error_log($this->sessionData['mailaccount']);
//error_log(print_r($identity,true));
//error_log(__METHOD__.__LINE__.print_r($identity,true));
//error_log(__METHOD__.__LINE__.':'.array2string($this->sessionData['signatureid']).'->'.print_r($signature,true));
// create the messages
$this->createMessage($mail, $_formData, $identity, $signature, true);
// remember the identity