mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-01 14:30:32 +02:00
Fixed bug 481943. Regexp that normalized linebreaks to \r\n was fucked, so it was changing (char)\n to \r\n and dropping (char). Hence we lost the char before every single linebreak in every email sent thru SMTP. yay. ALso fixed so it gets the FROM address from the right place.
git-svn-id: file:///svn/phpbb/trunk@1443 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -171,9 +171,17 @@ class emailer
|
||||
//
|
||||
function send()
|
||||
{
|
||||
global $phpEx;
|
||||
global $phpEx, $phpbb_root_dir;
|
||||
|
||||
$phpbb_root_path = "./";
|
||||
if (isset($phpbb_root_dir))
|
||||
{
|
||||
// we must be in the admin section.
|
||||
$phpbb_root_path = $phpbb_root_dir;
|
||||
}
|
||||
else
|
||||
{
|
||||
$phpbb_root_path = "./";
|
||||
}
|
||||
|
||||
if ($this->address == NULL)
|
||||
{
|
||||
|
Reference in New Issue
Block a user