|
From: Benjamin C. <bc...@us...> - 2005-02-15 13:34:29
|
Update of /cvsroot/phpbt/phpbt/inc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2321/inc Modified Files: functions.php Log Message: Trying to resolve some charset issues Index: functions.php =================================================================== RCS file: /cvsroot/phpbt/phpbt/inc/functions.php,v retrieving revision 1.48 retrieving revision 1.49 diff -u -r1.48 -r1.49 --- functions.php 22 Jan 2005 16:13:18 -0000 1.48 +++ functions.php 15 Feb 2005 13:34:20 -0000 1.49 @@ -591,12 +591,11 @@ $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=\"$charset\"\r\nContent-Transfer-Encoding: "; + $headers .= "Content-Type: text/html; charset=\"".CHARSET."\"\r\nContent-Transfer-Encoding: "; } else { - $headers .= "Content-Type: text/plain; charset=\"$charset\"\r\nContent-Transfer-Encoding: "; + $headers .= "Content-Type: text/plain; charset=\"".CHARSET."\"\r\nContent-Transfer-Encoding: "; } // If configured to send MIME encoded emails @@ -618,7 +617,6 @@ if (USE_GETTEXT) { return $plural ? ngettext($string) : gettext($string); } else { - @include_once('languages/'.LANGUAGE.'.php'); if (!empty($STRING[$string])) return $STRING[$string]; else return $string; } |