summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-08-19 12:13:59 -0300
committerFelipe Pena <felipensp@gmail.com>2012-08-19 12:13:59 -0300
commit6513ca85c2d30f43cfed29b51bd58fc8f7a10899 (patch)
tree0441f8232205a9fdf7de46a07bbf1c2e18a4bf4c
parent8693bae624a562dddfa7893eec651ebb03e0f16c (diff)
parentdc1138b102b8fde7a119cb8f7ceb30b26dfdf6b3 (diff)
downloadphp-git-6513ca85c2d30f43cfed29b51bd58fc8f7a10899.tar.gz
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3: - Value stored to var is never read
-rw-r--r--ext/dom/element.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/dom/element.c b/ext/dom/element.c
index c6a1902129..02fded9f1a 100644
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@@ -832,7 +832,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
}
if (errorcode == 0 && is_xmlns == 0) {
- attr = xmlSetNsProp(elemp, nsptr, (xmlChar *)localname, (xmlChar *)value);
+ xmlSetNsProp(elemp, nsptr, (xmlChar *)localname, (xmlChar *)value);
}
} else {
name_valid = xmlValidateName((xmlChar *) localname, 0);
@@ -844,7 +844,7 @@ PHP_FUNCTION(dom_element_set_attribute_ns)
if (attr != NULL && attr->type != XML_ATTRIBUTE_DECL) {
node_list_unlink(attr->children TSRMLS_CC);
}
- attr = xmlSetProp(elemp, (xmlChar *)localname, (xmlChar *)value);
+ xmlSetProp(elemp, (xmlChar *)localname, (xmlChar *)value);
}
}
}