]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Aug 2017 20:02:49 +0000 (22:02 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Fri, 25 Aug 2017 20:03:00 +0000 (22:03 +0200)
1  2 
NEWS
ext/intl/calendar/calendar_class.cpp

diff --cc NEWS
Simple merge
index a2024c07121ef8b49cce134efe8916319f80fe9c,94a2d5a19901cc884a22c89dd69de9e09ac2e5b3..e9c817af03b05e6d314299fe4085d1ec84232869
@@@ -467,19 -474,9 +467,8 @@@ void calendar_register_IntlCalendar_cla
        Calendar_handlers.offset = XtOffsetOf(Calendar_object, zo);
        Calendar_handlers.clone_obj = Calendar_clone_obj;
        Calendar_handlers.get_debug_info = Calendar_get_debug_info;
 -      Calendar_handlers.dtor_obj = Calendar_objects_dtor;
        Calendar_handlers.free_obj = Calendar_objects_free;
  
-       /* Create and register 'IntlGregorianCalendar' class. */
-       INIT_CLASS_ENTRY(ce, "IntlGregorianCalendar", GregorianCalendar_class_functions);
-       GregorianCalendar_ce_ptr = zend_register_internal_class_ex(&ce,
-               Calendar_ce_ptr);
-       if (!GregorianCalendar_ce_ptr) {
-               //can't happen know without bigger problems before
-               php_error_docref0(NULL, E_ERROR,
-                       "IntlGregorianCalendar: class registration has failed.");
-               return;
-       }
        /* Declare 'IntlCalendar' class constants */
  #define CALENDAR_DECL_LONG_CONST(name, val) \
        zend_declare_class_constant_long(Calendar_ce_ptr, name, sizeof(name) - 1, \