diff options
| author | Stanislav Malyshev <stas@php.net> | 2008-07-22 20:40:01 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2008-07-22 20:40:01 +0000 |
| commit | 0d30c88ded9883e801ef7e83ed78eae4f1eb20db (patch) | |
| tree | 7e70ad6bd0851e653f9501cc28183a3fab95086d /ext/intl | |
| parent | 07667caf131f1e10f1e440737515b56f5ffbcf91 (diff) | |
| download | php-git-0d30c88ded9883e801ef7e83ed78eae4f1eb20db.tar.gz | |
use correct locale check
Diffstat (limited to 'ext/intl')
| -rwxr-xr-x | ext/intl/collator/collator_create.c | 2 | ||||
| -rwxr-xr-x | ext/intl/dateformat/dateformat.c | 1 | ||||
| -rwxr-xr-x | ext/intl/formatter/formatter_main.c | 2 | ||||
| -rwxr-xr-x | ext/intl/msgformat/msgformat.c | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/ext/intl/collator/collator_create.c b/ext/intl/collator/collator_create.c index 404887b383..d42b7bcafd 100755 --- a/ext/intl/collator/collator_create.c +++ b/ext/intl/collator/collator_create.c @@ -44,7 +44,7 @@ static void collator_ctor(INTERNAL_FUNCTION_PARAMETERS) RETURN_NULL(); } - INTL_CHECK_LOCALE_LEN(locale_len); + INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC ); if(locale_len == 0) { diff --git a/ext/intl/dateformat/dateformat.c b/ext/intl/dateformat/dateformat.c index 055066a1b9..e4b71e08bf 100755 --- a/ext/intl/dateformat/dateformat.c +++ b/ext/intl/dateformat/dateformat.c @@ -98,6 +98,7 @@ static void datefmt_ctor(INTERNAL_FUNCTION_PARAMETERS) RETURN_NULL(); } + INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); DATE_FORMAT_METHOD_FETCH_OBJECT; // Convert pattern (if specified) to UTF-16. if( pattern_str && pattern_str_len>0 ){ diff --git a/ext/intl/formatter/formatter_main.c b/ext/intl/formatter/formatter_main.c index 85ea9d3157..d21534b9d8 100755 --- a/ext/intl/formatter/formatter_main.c +++ b/ext/intl/formatter/formatter_main.c @@ -45,7 +45,7 @@ static void numfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) RETURN_NULL(); } - INTL_CHECK_LOCALE_LEN(locale_len); + INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); object = return_value; FORMATTER_METHOD_FETCH_OBJECT; diff --git a/ext/intl/msgformat/msgformat.c b/ext/intl/msgformat/msgformat.c index 679beb81ad..ba8cef78a7 100755 --- a/ext/intl/msgformat/msgformat.c +++ b/ext/intl/msgformat/msgformat.c @@ -48,7 +48,7 @@ static void msgfmt_ctor(INTERNAL_FUNCTION_PARAMETERS) RETURN_NULL(); } - INTL_CHECK_LOCALE_LEN(locale_len); + INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value); MSG_FORMAT_METHOD_FETCH_OBJECT; // Convert pattern (if specified) to UTF-16. |