diff options
Diffstat (limited to 'ext/intl/collator')
| -rw-r--r-- | ext/intl/collator/collator_create.c | 2 | ||||
| -rw-r--r-- | ext/intl/collator/collator_sort.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c index b2a9968af4..b2a8c7f6ba 100644 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c @@ -48,7 +48,7 @@ static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS) COLLATOR_METHOD_FETCH_OBJECT; if(locale_len == 0) { - locale = INTL_G(default_locale); + locale = intl_locale_get_default(TSRMLS_C); } /* Open ICU collator. */ diff --git a/ext/intl/collator/collator_sort.c b/ext/intl/collator/collator_sort.c index 0785111c96..04a24f013e 100644 --- a/ext/intl/collator/collator_sort.c +++ b/ext/intl/collator/collator_sort.c @@ -78,6 +78,7 @@ static int collator_regular_compare_function(zval *result, zval *op1, zval *op2 intl_errors_set_custom_msg( COLLATOR_ERROR_P( co ), "Object not initialized", 0 TSRMLS_CC ); php_error_docref(NULL TSRMLS_CC, E_RECOVERABLE_ERROR, "Object not initialized"); + } /* Compare the strings using ICU. */ |