diff options
author | Xinchen Hui <laruence@php.net> | 2015-03-25 12:09:35 +0800 |
---|---|---|
committer | Xinchen Hui <laruence@php.net> | 2015-03-25 12:09:35 +0800 |
commit | 86bbacfd53323f040ae2e19584c99f672e245066 (patch) | |
tree | 55289142f2bb47acd4d3962dbfbf93c9e86390d6 /ext/soap/php_encoding.c | |
parent | c2ec4f90d2bbcc059612320be9ed802df2a5dcb2 (diff) | |
parent | 0e1024f25a447cc834ff7202389d60b5177d07ac (diff) | |
download | php-git-86bbacfd53323f040ae2e19584c99f672e245066.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/soap/php_encoding.c')
-rw-r--r-- | ext/soap/php_encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index dd557a7950..c6993b2e28 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -462,7 +462,7 @@ static xmlNodePtr master_to_xml_int(encodePtr encode, zval *data, int style, xml xmlNodeSetName(node, BAD_CAST(Z_STRVAL_PP(zname))); } if (zend_hash_find(ht, "enc_namens", sizeof("enc_namens"), (void **)&znamens) == SUCCESS && - Z_TYPE_PP(zname) == IS_STRING) { + Z_TYPE_PP(znamens) == IS_STRING) { xmlNsPtr nsp = encode_add_ns(node, Z_STRVAL_PP(znamens)); xmlSetNs(node, nsp); } |