[phpBT-dev] CVS: phpbt/inc functions.php,1.47,1.48

[Benjamin C. <bc...@us...>]

Update of /cvsroot/phpbt/phpbt/inc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30646/inc

Modified Files:
	functions.php 
Log Message:
Fixes bug #1089416 - Exchange confused by lack of charset in email

Index: functions.php
===================================================================
RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- functions.php	25 Oct 2004 12:07:00 -0000	1.47
+++ functions.php	22 Jan 2005 16:13:18 -0000	1.48
@@ -591,10 +591,12 @@
 		$headers .= "\n";
 		// There have to be no newline at the end of $headers
 	}
+	$charset = !empty($STRING['lang_charset']) ? 
+		$STRING['lang_charset'] : 'iso-8859-1';
 	if (false/*HTML_EMAIL*/) {
-		$headers .= "Content-Type: text/html; charset=\"".$STRING['lang_charset']."\"\r\nContent-Transfer-Encoding: ";
+		$headers .= "Content-Type: text/html; charset=\"$charset\"\r\nContent-Transfer-Encoding: ";
 	} else {
-		$headers .= "Content-Type: text/plain; charset=\"".$STRING['lang_charset']."\"\r\nContent-Transfer-Encoding: ";
+		$headers .= "Content-Type: text/plain; charset=\"$charset\"\r\nContent-Transfer-Encoding: ";
 	}
 
 	// If configured to send MIME encoded emails