Commit: 888e77ff733c5cb7c8f3d1fce6244463dd75a9b8 Author: Gustavo André dos Santos Lopes <cataphr...@php.net> Thu, 24 May 2012 14:04:19 +0200 Parents: 72c7cfe6f2b151466c33e7003dbc64a4e4e88a0c Branches: PHP-5.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=888e77ff733c5cb7c8f3d1fce6244463dd75a9b8 Log: 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(). Changed paths: M ext/intl/resourcebundle/resourcebundle_class.c Diff: diff --git a/ext/intl/resourcebundle/resourcebundle_class.c b/ext/intl/resourcebundle/resourcebundle_class.c index e3f8252..6529824 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) { -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
