jenkins-bot has submitted this change and it was merged.

Change subject: Don't crash on DOMText nodes
......................................................................


Don't crash on DOMText nodes

The list returned by DOMNavigator::findElementsWithClass can contain DOMText
nodes. To avoid crashing, check the nodeType.

Change-Id: Iaed24988134fbd0dda11719645fd94c7a05cbc50
---
M TemplateParser.php
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/TemplateParser.php b/TemplateParser.php
index 007f6fd..ebfcf95 100644
--- a/TemplateParser.php
+++ b/TemplateParser.php
@@ -330,7 +330,7 @@
 
                foreach ( $domNavigator->findElementsWithClass( '*', 'nuke' ) 
as $nukeNode ) {
                        $nukeLink = $nukeNode->firstChild;
-                       if ( $nukeLink && $nukeLink->hasAttribute( 'href' ) ) {
+                       if ( $nukeLink && $nukeLink->nodeType === 
XML_ELEMENT_NODE && $nukeLink->hasAttribute( 'href' ) ) {
                                $urlBits = wfParseUrl( $nukeLink->getAttribute( 
'href' ) );
                                if ( isset( $urlBits['query'] ) ) {
                                        $params = wfCgiToArray( 
$urlBits['query'] );

-- 
To view, visit https://gerrit.wikimedia.org/r/178790
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iaed24988134fbd0dda11719645fd94c7a05cbc50
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CommonsMetadata
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <[email protected]>
Gerrit-Reviewer: GergÅ‘ Tisza <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to