moriyoshi Sun Nov 10 16:32:55 2002 EDT
Modified files:
/php4/ext/mbstring mbstring.c
Log:
Fixed mb_send_mail() so that it correctly handles the language setting.
Index: php4/ext/mbstring/mbstring.c
diff -u php4/ext/mbstring/mbstring.c:1.134 php4/ext/mbstring/mbstring.c:1.135
--- php4/ext/mbstring/mbstring.c:1.134 Sun Nov 10 16:18:54 2002
+++ php4/ext/mbstring/mbstring.c Sun Nov 10 16:32:54 2002
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: mbstring.c,v 1.134 2002/11/10 21:18:54 moriyoshi Exp $ */
+/* $Id: mbstring.c,v 1.135 2002/11/10 21:32:54 moriyoshi Exp $ */
/*
* PHP4 Multibyte String module "mbstring" (currently only for Japanese)
@@ -3307,6 +3307,7 @@
head_enc, /* header transfar encoding */
body_enc; /* body transfar encoding */
mbfl_memory_device device; /* automatic allocateable buffer for
additional header */
+ const mbfl_language *lang;
int err = 0;
/* initialize */
@@ -3318,16 +3319,11 @@
tran_cs = mbfl_no_encoding_utf8;
head_enc = mbfl_no_encoding_base64;
body_enc = mbfl_no_encoding_base64;
- switch (MBSTRG(current_language)) {
- case mbfl_no_language_japanese:
- tran_cs = mbfl_no_encoding_2022jp;
- body_enc = mbfl_no_encoding_7bit;
- break;
- case mbfl_no_language_english:
- tran_cs = mbfl_no_encoding_8859_1;
- head_enc = mbfl_no_encoding_qprint;
- body_enc = mbfl_no_encoding_qprint;
- break;
+ lang = mbfl_no2language(MBSTRG(current_language));
+ if (lang != NULL) {
+ tran_cs = lang->mail_charset;
+ head_enc = lang->mail_header_encoding;
+ body_enc = lang->mail_body_encoding;
}
argc = ZEND_NUM_ARGS();
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
