From cd1f9c63d6441d70be4376f8e96a274151d30aae Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Sun, 30 Mar 2003 17:51:56 +0000
Subject: [PATCH] apply 2.0.x change

git-svn-id: file:///svn/phpbb/trunk@3759 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/includes/emailer.php | 30 ++++++++++++++++++++++++++++--
 1 file 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