From 1ae81bf877a40929c986c1b7961c2f70918fbb7e Mon Sep 17 00:00:00 2001 From: Martijn Otto Date: Mon, 17 Feb 2014 17:04:11 +0100 Subject: Fix constant declare function getting called for non-const and vice-versa --- src/nullmember.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/nullmember.h') diff --git a/src/nullmember.h b/src/nullmember.h index 54285f0..9b8584f 100644 --- a/src/nullmember.h +++ b/src/nullmember.h @@ -44,11 +44,11 @@ public: virtual void declare(struct _zend_class_entry *entry, const char *name, int size, int flags) override { #if PHP_VERSION_ID >= 50400 - if (flags == constMember) zend_declare_property_null(entry, name, size, flags); - else zend_declare_class_constant_null(entry, name, size); + if (flags == constMember) zend_declare_class_constant_null(entry, name, size); + else zend_declare_property_null(entry, name, size, flags); #else - if (flags == constMember) zend_declare_property_null(entry, (char *) name, size, flags); - else zend_declare_class_constant_null(entry, (char *) name, size); + if (flags == constMember) zend_declare_class_constant_null(entry, (char *) name, size); + else zend_declare_property_null(entry, (char *) name, size, flags); #endif } }; -- cgit v1.2.3