Bug #19176 ยป 9092.patch
| t3lib/class.t3lib_formmail.php (working copy) | ||
|---|---|---|
|
$this->organisation = ($convCharset && strlen($val)) ? $GLOBALS['TSFE']->csConvObj->conv($val,$GLOBALS['TSFE']->renderCharset,$this->charset) : $val;
|
||
|
$this->organisation = $this->sanitizeHeaderString($this->organisation);
|
||
|
$this->from_email = ($V['from_email']) ? $V['from_email'] : (($V['email'])?$V['email']:'');
|
||
|
if($GLOBALS['TSFE']->config['config']['mailformSenderField']) {
|
||
|
$sender = $V[$GLOBALS['TSFE']->config['config']['mailformSenderField']];
|
||
|
} elseif ($V['from_email']) {
|
||
|
$sender = $V['from_email'];
|
||
|
} elseif ($V['email']) {
|
||
|
$V['email'];
|
||
|
}
|
||
|
$this->from_email = $sender;
|
||
|
$this->from_email = t3lib_div::validEmail($this->from_email) ? $this->from_email : '';
|
||
|
$this->replyto_email = ($V['replyto_email']) ? $V['replyto_email'] : $this->from_email;
|
||
|
$this->replyto_email = t3lib_div::validEmail($this->replyto_email) ? $this->replyto_email : '';
|
||