diff options
| author | natec <natec@users.sourceforge.net> | 2001-11-26 00:50:03 +0000 |
|---|---|---|
| committer | natec <natec@users.sourceforge.net> | 2001-11-26 00:50:03 +0000 |
| commit | adb6ff9f58ad59bbd04ab455f322d439cf0621c5 (patch) | |
| tree | b93d36046f35b1ef5badc8b2be2d533434548770 /phpBB/includes/emailer.php | |
| parent | 67aae81a93249395bceed79762ea93f40b6bdbaa (diff) | |
| download | forums-adb6ff9f58ad59bbd04ab455f322d439cf0621c5.tar forums-adb6ff9f58ad59bbd04ab455f322d439cf0621c5.tar.gz forums-adb6ff9f58ad59bbd04ab455f322d439cf0621c5.tar.bz2 forums-adb6ff9f58ad59bbd04ab455f322d439cf0621c5.tar.xz forums-adb6ff9f58ad59bbd04ab455f322d439cf0621c5.zip | |
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
Diffstat (limited to 'phpBB/includes/emailer.php')
| -rwxr-xr-x | phpBB/includes/emailer.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index 85fe1428c3..b93e61f03c 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -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) { |