jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/404774 )
Change subject: Avoid notice in lead paragraph transform when encounter infobox
like elements
......................................................................
Avoid notice in lead paragraph transform when encounter infobox like elements
XPath query can return tables that look like infoboxes as
contains(@class,"infobox")
is not the same as hasClass('infobox'). Thus getInfoboxContainer can resolve
to false. This test and fix guards against that.
Bug: T185106
Change-Id: I5a8fbbb956365de9af09ee8d238fb3389e8f2cef
---
M includes/transforms/MoveLeadParagraphTransform.php
M tests/phpunit/transforms/MoveLeadParagraphTransformTest.php
2 files changed, 5 insertions(+), 1 deletion(-)
Approvals:
Pmiazga: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/transforms/MoveLeadParagraphTransform.php
b/includes/transforms/MoveLeadParagraphTransform.php
index d2d5b35..08ef454 100644
--- a/includes/transforms/MoveLeadParagraphTransform.php
+++ b/includes/transforms/MoveLeadParagraphTransform.php
@@ -107,7 +107,7 @@
if ( $listElementAfterParagraph !== null ) {
$leadSectionBody->insertBefore(
$listElementAfterParagraph, $where );
}
- } elseif ( $infobox->parentNode !== $leadSectionBody ) {
+ } elseif ( $infobox && $infobox->parentNode !==
$leadSectionBody ) {
/**
* @see
https://phabricator.wikimedia.org/T149884
* @todo remove after research is done
diff --git a/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php
b/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php
index c2cbc2c..bfd8dc7 100644
--- a/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php
+++ b/tests/phpunit/transforms/MoveLeadParagraphTransformTest.php
@@ -91,6 +91,10 @@
return [
[
+ '<div><table
class="mf-infobox"></table></div><p>one</p>',
+ '<div><table
class="mf-infobox"></table></div><p>one</p>'
+ ],
+ [
"$infobox$paragraph",
"$paragraph$infobox",
],
--
To view, visit https://gerrit.wikimedia.org/r/404774
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5a8fbbb956365de9af09ee8d238fb3389e8f2cef
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Pmiazga <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
