summaryrefslogtreecommitdiff
path: root/ext/intl/php_intl.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/intl/php_intl.c')
-rw-r--r--ext/intl/php_intl.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c
index ff1627a18f..2c5e74809d 100644
--- a/ext/intl/php_intl.c
+++ b/ext/intl/php_intl.c
@@ -1,6 +1,6 @@
/*
+----------------------------------------------------------------------+
- | PHP Version 5 |
+ | PHP Version 7 |
+----------------------------------------------------------------------+
| This source file is subject to version 3.01 of the PHP license, |
| that is bundled with this package in the file LICENSE, and is |
@@ -910,7 +910,7 @@ PHP_MINIT_FUNCTION( intl )
/* For the default locale php.ini setting */
REGISTER_INI_ENTRIES();
- REGISTER_LONG_CONSTANT("INTL_MAX_LOCALE_LEN", INTL_MAX_LOCALE_LEN, CONST_CS);
+ REGISTER_LONG_CONSTANT("INTL_MAX_LOCALE_LEN", INTL_MAX_LOCALE_LEN, CONST_PERSISTENT | CONST_CS);
REGISTER_STRING_CONSTANT("INTL_ICU_VERSION", U_ICU_VERSION, CONST_PERSISTENT | CONST_CS);
#ifdef U_ICU_DATA_VERSION
REGISTER_STRING_CONSTANT("INTL_ICU_DATA_VERSION", U_ICU_DATA_VERSION, CONST_PERSISTENT | CONST_CS);
@@ -1032,8 +1032,8 @@ PHP_RINIT_FUNCTION( intl )
*/
PHP_RSHUTDOWN_FUNCTION( intl )
{
- if(INTL_G(current_collator)) {
- INTL_G(current_collator) = NULL;
+ if(!Z_ISUNDEF(INTL_G(current_collator))) {
+ ZVAL_UNDEF(&INTL_G(current_collator));
}
if (INTL_G(grapheme_iterator)) {
grapheme_close_global_iterator( TSRMLS_C );