diff options
| author | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-25 10:59:58 +0200 |
|---|---|---|
| committer | Gustavo André dos Santos Lopes <cataphract@php.net> | 2012-06-25 10:59:58 +0200 |
| commit | 9c5074a484b7f10e65471a21a7ef50dda8391509 (patch) | |
| tree | 3f106a51663d8abca754f1dc77716e36b76116f7 /ext/intl/php_intl.c | |
| parent | ee8b9d5c6f7390a56b277b170e2e3baee5c74bf4 (diff) | |
| download | php-git-9c5074a484b7f10e65471a21a7ef50dda8391509.tar.gz | |
Fix undeclared intl_locale_get_default()
This was causing segfaults at least in the resourcebundle
constructor.
Also moved intl_locale_get_default() to a more central location
and fixed a constness warning in resourcebundle_ctor().
Diffstat (limited to 'ext/intl/php_intl.c')
| -rwxr-xr-x | ext/intl/php_intl.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ext/intl/php_intl.c b/ext/intl/php_intl.c index 59272db712..e0d1081514 100755 --- a/ext/intl/php_intl.c +++ b/ext/intl/php_intl.c @@ -109,6 +109,14 @@ ZEND_DECLARE_MODULE_GLOBALS( intl ) +const char *intl_locale_get_default( TSRMLS_D ) +{ + if( INTL_G(default_locale) == NULL ) { + return uloc_getDefault(); + } + return INTL_G(default_locale); +} + /* {{{ Arguments info */ ZEND_BEGIN_ARG_INFO_EX(collator_static_0_args, 0, 0, 0) ZEND_END_ARG_INFO() |