diff options
author | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
---|---|---|
committer | Paul S. Owen <psotfx@users.sourceforge.net> | 2002-04-20 00:22:29 +0000 |
commit | 5b0bba72b1c619af2f39859ec0c262f860f991ac (patch) | |
tree | 9fb003cf223ff6bf2e26feb78a35603dff88a471 /phpBB/includes/emailer.php | |
parent | 65aa92182826eb06830626df49ab7a0210b06718 (diff) | |
download | forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.gz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.bz2 forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.tar.xz forums-5b0bba72b1c619af2f39859ec0c262f860f991ac.zip |
merged from 2.0.0 branch (marked merge_point_20020420) + assorted updates and trial stuff for example session alterations
git-svn-id: file:///svn/phpbb/trunk@2532 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/emailer.php')
-rwxr-xr-x | phpBB/includes/emailer.php | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php index a6e8aaf5f0..331d8fc3e8 100755 --- a/phpBB/includes/emailer.php +++ b/phpBB/includes/emailer.php @@ -178,17 +178,7 @@ class emailer // function send() { - global $phpEx, $phpbb_root_dir; - - if (isset($phpbb_root_dir)) - { - // we must be in the admin section. - $phpbb_root_path = $phpbb_root_dir; - } - else - { - $phpbb_root_path = "./"; - } + global $phpEx, $phpbb_root_path; if ($this->address == NULL) { |