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

diff --cc ext/intl/collator/collator_create.c
index a3b70159f2a0e65bec216623245b05f26d89d2e1,b2a9968af49a686babb1fdf3ce646abf60cf7738..b2a8c7f6bac074f37073350a63b1c54465def1ef
--- 1/ext/intl/collator/collator_create.c
--- 2/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_attr.c
Simple merge

diff --cc ext/intl/dateformat/dateformat_class.c
index fc4a8b8eb10f48c42675907b77db19bc47450831,801ca3379e38f81829b33b2688687ef3c79c851a..c465255ad4bf224fad30d231b920d45fccc6a82d
--- 1/ext/intl/dateformat/dateformat_class.c
--- 2/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;
  

diff --cc ext/intl/dateformat/dateformat_class.h
Simple merge

diff --cc ext/intl/formatter/formatter_main.c
Simple merge

diff --cc ext/intl/msgformat/msgformat.c
Simple merge

diff --cc ext/intl/resourcebundle/resourcebundle_class.c
Simple merge