]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Thu, 19 Sep 2019 09:36:09 +0000 (11:36 +0200)
1  2 
ext/date/php_date.c

index d3fa0ddd417a01b86d7cb41763de66d45e0cc8e3,0bde5430324d885ae8b538f6b68b5174988a7524..1a1f6e2b35f9385d6fea50f4daa4a3ce1c132bc5
@@@ -2920,14 -2919,17 +2920,14 @@@ PHP_METHOD(DateTimeImmutable, createFro
  static int php_date_initialize_from_hash(php_date_obj **dateobj, HashTable *myht)
  {
        zval             *z_date;
 -      zval             *z_timezone;
 -      zval             *z_timezone_type;
        zval              tmp_obj;
        timelib_tzinfo   *tzi;
 -      php_timezone_obj *tzobj;
  
-       z_date = zend_hash_str_find(myht, "date", sizeof("data")-1);
+       z_date = zend_hash_str_find(myht, "date", sizeof("date")-1);
        if (z_date && Z_TYPE_P(z_date) == IS_STRING) {
 -              z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1);
 +              zval *z_timezone_type = zend_hash_str_find(myht, "timezone_type", sizeof("timezone_type")-1);
                if (z_timezone_type && Z_TYPE_P(z_timezone_type) == IS_LONG) {
 -                      z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1);
 +                      zval *z_timezone = zend_hash_str_find(myht, "timezone", sizeof("timezone")-1);
                        if (z_timezone && Z_TYPE_P(z_timezone) == IS_STRING) {
                                switch (Z_LVAL_P(z_timezone_type)) {
                                        case TIMELIB_ZONETYPE_OFFSET: