1
0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 18:46:20 +02:00

Possible fix for wrap problems on email addresses

This commit is contained in:
e107steved
2007-11-04 20:25:02 +00:00
parent a9630e7f8e
commit c2480a88cf
2 changed files with 7 additions and 7 deletions

View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/e_parse_class.php,v $
| $Revision: 1.18 $ | $Revision: 1.19 $
| $Date: 2007-11-04 09:05:13 $ | $Date: 2007-11-04 20:25:02 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@ -809,7 +809,7 @@ class e_parse
$text = stripslashes($text); $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); $text = $this->toHTML($text,TRUE,$mods);
return $text; return $text;
} }

View File

@ -11,8 +11,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $ | $Source: /cvs_backup/e107_0.8/e107_handlers/mail.php,v $
| $Revision: 1.9 $ | $Revision: 1.10 $
| $Date: 2007-11-01 20:10:10 $ | $Date: 2007-11-04 20:25:02 $
| $Author: e107steved $ | $Author: e107steved $
+----------------------------------------------------------------------------+ +----------------------------------------------------------------------------+
*/ */
@ -102,8 +102,8 @@ function sendemail($send_to, $subject, $message, $to_name, $send_from='', $from_
if (!trim($send_from)) if (!trim($send_from))
{ {
$from_name = $tp->toEmail(varsettrue($pref['replyto_name'],$pref['siteadmin']),"","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']),"","parse_sc, no_make_clickable, defs"); $send_from = $tp->toEmail(varsettrue($pref['replyto_email'],$pref['siteadminemail']),"","RAWTEXT");
} }
$mail->CharSet = CHARSET; $mail->CharSet = CHARSET;
$mail->From = $send_from; $mail->From = $send_from;