fix bug #55285 XMLReader::getAttribute/No/Ns methods inconsistency

jrbasso · Oct 3, 2013 · c7b1d76 · c7b1d76
1 parent 2a1bd12
commit c7b1d76
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/NEWS b/NEWS
@@ -55,4 +55,8 @@ PHP                                                                        NEWS
   . Implemented FR #65634 (HTTP wrapper is very slow with protocol_version
     1.1). (Adam)
 
+- XMLReader:
+  . Fixed bug #55285 (XMLReader::getAttribute/No/Ns methods inconsistency). 
+    (Mike)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
@@ -61,6 +61,10 @@ PHP X.Y UPGRADE NOTES
   CURLOPT_SAFE_UPLOAD is now turned on by default and uploads with @file 
   do not work unless it is explicitly set to false.
 
+- XMLReader:
+  XMLReader::getAttributeNs and XMLReader::getAttributeNo now return NULL if
+  the attribute could not be found, just like XMLReader::getAttribute.
+
 ========================================
 5. New Functions
 ========================================

diff --git a/ext/xmlreader/php_xmlreader.c b/ext/xmlreader/php_xmlreader.c
@@ -588,9 +588,6 @@ PHP_METHOD(xmlreader, getAttributeNo)
 	if (retchar) {
 		RETVAL_STRING(retchar, 1);
 		xmlFree(retchar);
-		return;
-	} else {
-		RETURN_EMPTY_STRING();
 	}
 }
 /* }}} */
@@ -622,9 +619,6 @@ PHP_METHOD(xmlreader, getAttributeNs)
 	if (retchar) {
 		RETVAL_STRING(retchar, 1);
 		xmlFree(retchar);
-		return;
-	} else {
-		RETURN_EMPTY_STRING();
 	}
 }
 /* }}} */