From: Dmitry Stogov <dmitry@php.net>
Date: Fri, 7 Oct 2005 08:21:37 +0000 (+0000)
Subject: Reverted last George patches
X-Git-Tag: RELEASE_0_9_1~205
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5d4a602eaa87221bd9ac2b51a28d62c95eef3628;p=php

Reverted last George patches
---

diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c
index 2e28e41e42..7fc61f7b6a 100644
--- a/ext/soap/php_encoding.c
+++ b/ext/soap/php_encoding.c
@@ -319,10 +319,6 @@ xmlNodePtr master_to_xml(encodePtr encode, zval *data, int style, xmlNodePtr par
 			node = encode->to_xml_after(&encode->details, node, style);
 		}
 	}
-	if(!node) {
-		node = xmlNewNode(NULL,"BOGUS");
-		xmlAddChild(parent, node);
-	}
 	return node;
 }
 
@@ -1189,7 +1185,6 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 
 			enc = sdlType->encode;
 			while (enc && enc->details.sdl_type &&
-			       enc->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@@ -1212,7 +1207,6 @@ static zval *to_zval_object(encodeTypePtr type, xmlNodePtr data)
 		           sdlType->encode &&
 		           type != &sdlType->encode->details) {
 			if (sdlType->encode->details.sdl_type &&
-			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@@ -1542,7 +1536,6 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 
 			enc = sdlType->encode;
 			while (enc && enc->details.sdl_type &&
-			       enc->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
 			       enc->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@@ -1552,8 +1545,11 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 				zval *tmp = get_zval_property(data, "_" TSRMLS_CC);
 				if (tmp) {
 					xmlParam = master_to_xml(enc, tmp, style, parent);
-				} else {
+				} else if (prop == NULL) {
 					xmlParam = master_to_xml(enc, data, style, parent);
+				} else {
+					xmlParam = xmlNewNode(NULL,"BOGUS");
+					xmlAddChild(parent, xmlParam);
 				}
 			} else {
 				xmlParam = xmlNewNode(NULL,"BOGUS");
@@ -1562,7 +1558,6 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 		} else if (sdlType->kind == XSD_TYPEKIND_EXTENSION &&
 		           sdlType->encode && type != &sdlType->encode->details) {
 			if (sdlType->encode->details.sdl_type &&
-			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_COMPLEX &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_SIMPLE &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_LIST &&
 			    sdlType->encode->details.sdl_type->kind != XSD_TYPEKIND_UNION) {
@@ -1572,9 +1567,12 @@ static xmlNodePtr to_xml_object(encodeTypePtr type, zval *data, int style, xmlNo
 
 				if (tmp) {
 					xmlParam = master_to_xml(sdlType->encode, tmp, style, parent);
-				} else {
+				} else if (prop == NULL) {
 					xmlParam = master_to_xml(sdlType->encode, data, style, parent);
-				} 
+				} else {
+					xmlParam = xmlNewNode(NULL,"BOGUS");
+					xmlAddChild(parent, xmlParam);
+				}
 			}
 		} else {
 			xmlParam = xmlNewNode(NULL,"BOGUS");