--- embedaddon/php/ext/intl/msgformat/msgformat.c	2012/02/21 23:47:56	1.1.1.1
+++ embedaddon/php/ext/intl/msgformat/msgformat.c	2013/07/22 01:31:52	1.1.1.2
@@ -49,7 +49,7 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) 
 	}
 
 	INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
-	MSG_FORMAT_METHOD_FETCH_OBJECT;
+	MSG_FORMAT_METHOD_FETCH_OBJECT_NO_CHECK;
 
 	/* Convert pattern (if specified) to UTF-16. */
 	if(pattern && pattern_len) {
@@ -64,8 +64,14 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) 
 		locale = INTL_G(default_locale);
 	}
 
+#ifdef MSG_FORMAT_QUOTE_APOS
 	if(msgformat_fix_quotes(&spattern, &spattern_len, &INTL_DATA_ERROR_CODE(mfo)) != SUCCESS) {
 		INTL_CTOR_CHECK_STATUS(mfo, "msgfmt_create: error converting pattern to quote-friendly format");
+	}
+#endif
+
+	if ((mfo)->mf_data.orig_format) {
+		msgformat_data_free(&mfo->mf_data TSRMLS_CC);
 	}
 
 	(mfo)->mf_data.orig_format = estrndup(pattern, pattern_len);