mirror of
https://github.com/e107inc/e107.git
synced 2025-04-20 04:32:01 +02:00
Possible fix for wrap problems on email addresses
This commit is contained in:
parent
a9630e7f8e
commit
c2480a88cf
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
|
||||
| $Revision: 1.18 $
|
||||
| $Date: 2007-11-04 09:05:13 $
|
||||
| $Revision: 1.19 $
|
||||
| $Date: 2007-11-04 20:25:02 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -809,7 +809,7 @@ class e_parse
|
||||
$text = stripslashes($text);
|
||||
}
|
||||
|
||||
$text = ($mods != "rawtext") ? $this->replaceConstants($text,"full") : $text;
|
||||
$text = (strtolower($mods) != "rawtext") ? $this->replaceConstants($text,"full") : $text;
|
||||
$text = $this->toHTML($text,TRUE,$mods);
|
||||
return $text;
|
||||
}
|
||||
|
@ -11,8 +11,8 @@
|
||||
| GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
|
||||
| $Revision: 1.9 $
|
||||
| $Date: 2007-11-01 20:10:10 $
|
||||
| $Revision: 1.10 $
|
||||
| $Date: 2007-11-04 20:25:02 $
|
||||
| $Author: e107steved $
|
||||
+----------------------------------------------------------------------------+
|
||||
*/
|
||||
@ -102,8 +102,8 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from='', $from_
|
||||
|
||||
if (!trim($send_from))
|
||||
{
|
||||
$from_name = $tp->toEmail(varsettrue($pref['replyto_name'],$pref['siteadmin']),"","parse_sc, no_make_clickable, defs");
|
||||
$send_from = $tp->toEmail(varsettrue($pref['replyto_email'],$pref['siteadminemail']),"","parse_sc, no_make_clickable, defs");
|
||||
$from_name = $tp->toEmail(varsettrue($pref['replyto_name'],$pref['siteadmin']),"","RAWTEXT");
|
||||
$send_from = $tp->toEmail(varsettrue($pref['replyto_email'],$pref['siteadminemail']),"","RAWTEXT");
|
||||
}
|
||||
$mail->CharSet = CHARSET;
|
||||
$mail->From = $send_from;
|
||||
|
Loading…
x
Reference in New Issue
Block a user