From: Moriyoshi Koizumi <moriyoshi@php.net>
Date: Mon, 4 Aug 2008 21:06:50 +0000 (+0000)
Subject: - MFH: More fixes for bug #45691
X-Git-Tag: php-5.2.7RC1~147
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=108d9dd8e70465e33118776c93ff2222a4aa1950;p=php

- MFH: More fixes for bug #45691
---

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 29f4bdd88f..776537aca4 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -802,6 +802,11 @@ static PHP_INI_MH(OnUpdate_mbstring_substitute_character)
 				}
 			}
 		}
+	} else {
+		MBSTRG(filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+		MBSTRG(current_filter_illegal_mode) = MBFL_OUTPUTFILTER_ILLEGAL_MODE_CHAR;
+		MBSTRG(filter_illegal_substchar) = 0x3f;	/* '?' */
+		MBSTRG(current_filter_illegal_substchar) = 0x3f;	/* '?' */
 	}
 
 	return SUCCESS;
@@ -972,9 +977,7 @@ PHP_RINIT_FUNCTION(mbstring)
 	MBSTRG(current_filter_illegal_mode) = MBSTRG(filter_illegal_mode);
 	MBSTRG(current_filter_illegal_substchar) = MBSTRG(filter_illegal_substchar);
 
-	if (!MBSTRG(encoding_translation)) {
-		MBSTRG(illegalchars) = 0;
-	}
+	MBSTRG(illegalchars) = 0;
 
 	n = 0;
 	if (MBSTRG(detect_order_list)) {