From 888e77ff733c5cb7c8f3d1fce6244463dd75a9b8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gustavo=20Andr=C3=A9=20dos=20Santos=20Lopes?= Date: Thu, 24 May 2012 14:04:19 +0200 Subject: [PATCH] Fixed last commit on 5.4 There's no change from the intended behavior. If INTL_G(default_locale) is NULL, the default ICU locale, as given by locale_get_default() in master, will still be used by ures_open(). --- ext/intl/resourcebundle/resourcebundle_class.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index e3f8252b91..6529824aa7 100644 --- a/ext/intl/resourcebundle/resourcebundle_class.c +++ b/ext/intl/resourcebundle/resourcebundle_class.c @@ -103,7 +103,7 @@ static void resourcebundle_ctor(INTERNAL_FUNCTION_PARAMETERS) INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); if (locale == NULL) { - locale = intl_locale_get_default(TSRMLS_C); + locale = INTL_G(default_locale); } if (fallback) { -- 2.40.0