com php-src: Merge branch 'PHP-5.4': ext/intl/collator/collator _create.c ext/intl/dateformat/dateformat_attr.c ext
/intl/dateformat/dateformat_class.c ext/intl/dateformat/d ateformat_class.h ext/intl/formatter/formatter_main.c ext/intl/msgformat/msgformat.c
ext/intl/resourcebundle/r esourcebundle_class.c
| From: | Gustavo André dos Santos Lopes | Date: | Wed, 22 Aug 2012 20:53:07 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4': ext/intl/collator/collator _create.c ext/intl/dateformat/dateformat_attr.c ext /intl/dateformat/dateformat_class.c ext/intl/dateformat/d ateformat_class.h ext/intl/formatter/formatter_main.c ext/intl/msgformat/msgformat.c ext/intl/resourcebundle/r esourcebundle_class.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-69931@lists.php.net to get a copy of this message | ||
Commit: fcd4420dbf51b8d343894bb852556cc2ccc462e3
Author: Gustavo Lopes <glopes@nebm.ist.utl.pt> Wed, 22 Aug 2012 22:53:07 +0200
Parents: 815874c646468f73d4bba3619543ab047873b5e7 cd1f45b3be2e630aab32f58770124d38661b518e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fcd4420dbf51b8d343894bb852556cc2ccc462e3
Log:
Merge branch 'PHP-5.4'
* PHP-5.4:
Fix handling of several uinitialized intl objects
Fix handling of several uinitialized intl objects
- Fix NEWS
- BFN
Conflicts:
ext/intl/dateformat/dateformat.c
Changed paths:
MM ext/intl/collator/collator_create.c
MM ext/intl/dateformat/dateformat_attr.c
MM ext/intl/dateformat/dateformat_class.c
MM ext/intl/dateformat/dateformat_class.h
MM ext/intl/formatter/formatter_main.c
MM ext/intl/msgformat/msgformat.c
MM ext/intl/resourcebundle/resourcebundle_class.c
Diff:
diff --cc ext/intl/collator/collator_create.c
index a3b7015,b2a9968..b2a8c7f
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@@@ -45,10 -45,10 +45,10 @@@ static void collator_ctor(INTERNAL_FUNC
}
INTL_CHECK_LOCALE_LEN_OBJ(locale_len, return_value);
- co = (Collator_object *) zend_object_store_get_object( object TSRMLS_CC );
+ COLLATOR_METHOD_FETCH_OBJECT;
if(locale_len == 0) {
- locale = INTL_G(default_locale);
+ locale = intl_locale_get_default(TSRMLS_C);
}
/* Open ICU collator. */
diff --cc ext/intl/dateformat/dateformat_class.c
index fc4a8b8,801ca33..c465255
--- a/ext/intl/dateformat/dateformat_class.c
+++ b/ext/intl/dateformat/dateformat_class.c
@@@ -23,8 -22,9 +23,10 @@@
#include "dateformat_parse.h"
#include "dateformat.h"
#include "dateformat_attr.h"
+#include "dateformat_attrcpp.h"
+ #include <zend_exceptions.h>
+
zend_class_entry *IntlDateFormatter_ce_ptr = NULL;
static zend_object_handlers IntlDateFormatter_handlers;