]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorXinchen Hui <laruence@gmail.com>
Sat, 27 May 2017 04:08:48 +0000 (12:08 +0800)
committerXinchen Hui <laruence@gmail.com>
Sat, 27 May 2017 04:08:48 +0000 (12:08 +0800)
* PHP-7.0:
  Fixed bug #74657 (Undefined constants in array properties result in broken properties)

1  2 
Zend/zend_API.c

diff --cc Zend/zend_API.c
index d73ad76fcb690d9deed386121dd81429e4c5f16b,4f9f4f9b4607be34985c65586799d22ff5b8d4a8..323e10160d3b317c4911af316907450e46b0e2ad
@@@ -1157,8 -1157,13 +1155,11 @@@ ZEND_API int zend_update_class_constant
                                } ZEND_HASH_FOREACH_END();
                                ce = ce->parent;
                        }
 -
 -                      *scope = old_scope;
                }
        }
+       class_type->ce_flags |= ZEND_ACC_CONSTANTS_UPDATED;
        return SUCCESS;
  }
  /* }}} */