- WS

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 5b1d3d7377d58d932ae4096d139e8f9ff21fedf4..6eb2764d11cfd532b1f833ba70721cdadfa048bd 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -3028,7 +3028,7 @@ ZEND_API int zend_u_declare_property_ex(zend_class_entry *ce, zend_uchar type, z
 
        property_info.doc_comment = doc_comment;
        property_info.doc_comment_len = doc_comment_len;
-       
+
        property_info.ce = ce;
 
        zend_u_hash_update(&ce->properties_info, type, name, name_length + 1, &property_info, sizeof(zend_property_info), NULL);

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index c00a68045d3bd1083d5adc0604bb654d55c9b652..5c0aed777e1c093c5be257126e8df65f5ca32d95 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3318,6 +3318,7 @@ static int zend_constant_ct_subst(znode *result, zval *const_name TSRMLS_DC)
        return 0;
 }
 
+
 void zend_do_fetch_constant(znode *result, znode *constant_container, znode *constant_name, int mode TSRMLS_DC)
 {
        switch (mode) {

diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index 266e23817d4d36bde80e20fe06e72a94b601cf4f..6205518e2f6fd04b42705857704236670784c58f 100644 (file)
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -221,7 +221,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce
        if (EG(scope) != ce
                && is_derived_class(ce, EG(scope))
                && EG(scope)
-         && zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS
+               && zend_u_hash_quick_find(&EG(scope)->properties_info, Z_TYPE_P(member), Z_UNIVAL_P(member), Z_UNILEN_P(member)+1, h, (void **) &scope_property_info)==SUCCESS
                && scope_property_info->flags & ZEND_ACC_PRIVATE) {
                return scope_property_info;
        } else if (property_info) {
@@ -239,7 +239,7 @@ ZEND_API struct _zend_property_info *zend_get_property_info(zend_class_entry *ce
                EG(std_property_info).name = Z_UNIVAL_P(member);
                EG(std_property_info).name_length = Z_UNILEN_P(member);
                EG(std_property_info).h = h;
-               EG(std_property_info).ce = ce;;
+               EG(std_property_info).ce = ce;
                property_info = &EG(std_property_info);
        }
        return property_info;