From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Wed, 13 Nov 2002 08:13:34 +0000 (+0000)
Subject: Fixed mb_encode_mimeheader() to work with languages other than Japanese and
X-Git-Tag: php-4.3.0RC1~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e01b60c2fb918e529ccd43e50781af699d086577;p=php

Fixed mb_encode_mimeheader() to work with languages other than Japanese and
English
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 28bd4fe17f..29d9489a9c 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2784,17 +2784,10 @@ PHP_FUNCTION(mb_encode_mimeheader)
 			RETURN_FALSE;
 		}
 	} else {
-		switch (MBSTRG(current_language)) {
-		case mbfl_no_language_japanese:
-			charset = mbfl_no_encoding_2022jp;
-			break;
-		case mbfl_no_language_english:
-			charset = mbfl_no_encoding_8859_1;
-			transenc = mbfl_no_encoding_qprint;
-			break;
-		default:
-			charset = mbfl_no_encoding_utf8;
-			break;
+		const mbfl_language *lang = mbfl_no2language(MBSTRG(current_language));
+		if (lang != NULL) {
+			charset = lang->mail_charset;
+			transenc = lang->mail_header_encoding;
 		}
 	}