From: Gustavo Lopes <glopes@nebm.ist.utl.pt>
Date: Wed, 22 Aug 2012 20:53:07 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcd4420dbf51b8d343894bb852556cc2ccc462e3;p=php

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
---

fcd4420dbf51b8d343894bb852556cc2ccc462e3
diff --cc ext/intl/collator/collator_create.c
index a3b70159f2,b2a9968af4..b2a8c7f6ba
--- 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 fc4a8b8eb1,801ca3379e..c465255ad4
--- 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;