aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xphpBB/includes/emailer.php30
1 files changed, 28 insertions, 2 deletions
diff --git a/phpBB/includes/emailer.php b/phpBB/includes/emailer.php
index 49fcd215b1..a986bdae51 100755
--- a/phpBB/includes/emailer.php
+++ b/phpBB/includes/emailer.php
@@ -38,9 +38,35 @@ class emailer
}
// Sets an email address to send to
- function email_address($address)
+ function email_address($address, $lang_var = '', $template_lang = '')
{
- $this->address = $address;
+ global $config, $phpbb_root_path, $phpEx;
+
+ $this->address = '';
+
+ // If a language variable for non-disclosure is passed, we prepend it to the address.
+ if ($lang_var != '')
+ {
+ if ( $template_lang == '' )
+ {
+ $template_lang = $config['default_lang'];
+ }
+
+ $language_file = $phpbb_root_path . 'language/' . $template_lang . '/lang_main.' . $phpEx;
+
+ if ( !@file_exists($language_file) )
+ {
+ $language_file = $phpbb_root_path . 'language/' . $config['default_lang'] . '/lang_main.' . $phpEx;
+ }
+
+ if ( @file_exists($language_file) )
+ {
+ include($language_file);
+ $this->address .= $lang[$lang_var];
+ }
+ }
+
+ $this->address .= $address;
}
// set up subject for mail