Allow recursive calls to __get/__set for different properties

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 5233018088837857e3fbb11cb839ea28c5d6d7a3..7b44e9b9291c22c80231f210d1e678c055726bae 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -344,8 +344,7 @@ PHP_MYSQLI_EXPORT(zend_object_value) mysqli_objects_new(zend_class_entry *class_
        intern = emalloc(sizeof(mysqli_object));
        memset(intern, 0, sizeof(mysqli_object));
        intern->zo.ce = class_type;
-       intern->zo.in_get = 0;
-       intern->zo.in_set = 0;
+       intern->zo.guards = NULL;
        intern->ptr = NULL;
        intern->valid = 0;
        intern->prop_handler = NULL;

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
index 77eababaeb2b69ad59d84c8857a998c28a1f3ae0..ebf44753cb4029bae2eb2acc212f360e3073af6e 100644 (file)
--- a/ext/xmlreader/php_xmlreader.c
+++ b/ext/xmlreader/php_xmlreader.c
@@ -352,8 +352,7 @@ zend_object_value xmlreader_objects_new(zend_class_entry *class_type TSRMLS_DC)
 
        intern = emalloc(sizeof(xmlreader_object));
        intern->std.ce = class_type;
-       intern->std.in_get = 0;
-       intern->std.in_set = 0;
+       intern->std.guards = NULL;
        intern->ptr = NULL;
        intern->input = NULL;
        intern->schema = NULL;

diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
index ed29cbb382bf24f8d34558b5262e3d50e3c10ad2..7959e037261604d55163b13c2e83587ff578e91f 100644 (file)
--- a/ext/xsl/php_xsl.c
+++ b/ext/xsl/php_xsl.c
@@ -120,8 +120,7 @@ zend_object_value xsl_objects_new(zend_class_entry *class_type TSRMLS_DC)
 
        intern = emalloc(sizeof(xsl_object));
        intern->std.ce = class_type;
-       intern->std.in_get = 0;
-       intern->std.in_set = 0;
+       intern->std.guards = NULL;
        intern->ptr = NULL;
        intern->prop_handler = NULL;
        intern->parameter = NULL;