com php-src: - Fix conflict: ext/intl/dateformat/dateformat_c lass.c ext/intl/resourcebundle/resourcebundle_class.c

Commit: f94051ea11ebfa206ef0c52da86334dcf9b93c66 Author: Felipe Pena <felipensp@gmail.com> Sat, 14 Jul 2012 12:23:24 -0300 Parents: 44cdcb7fdbc8756ff669dc7bbccf05e51d12d67f 0bff7cfadd0177601cd7b7253b7311d3bd13fa45 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=f94051ea11ebfa206ef0c52da86334dcf9b93c66 Log: - Fix conflict Changed paths: MM ext/intl/dateformat/dateformat_class.c MM ext/intl/resourcebundle/resourcebundle_class.c Diff: diff --cc ext/intl/dateformat/dateformat_class.c index fda67f1,a9e06c1..d250f75 --- a/ext/intl/dateformat/dateformat_class.c +++ b/ext/intl/dateformat/dateformat_class.c @@@ -64,10 -63,11 +64,11 @@@ zend_object_value IntlDateFormatter_obj intern = ecalloc( 1, sizeof(IntlDateFormatter_object) ); dateformat_data_init( &intern->datef_data TSRMLS_CC ); zend_object_std_init( &intern->zo, ce TSRMLS_CC ); + object_properties_init(&intern->zo, ce); - intern->date_type = 0; - intern->time_type = 0; - intern->calendar = 1; /* Gregorian calendar */ - intern->timezone_id = NULL; + intern->date_type = 0; + intern->time_type = 0; + intern->calendar = -1; + intern->requested_locale = NULL; retval.handle = zend_objects_store_put( intern,