jenkins-bot has submitted this change and it was merged. Change subject: Pass arrays to array_merge, instead of Titles and TitleArray iterator objects ......................................................................
Pass arrays to array_merge, instead of Titles and TitleArray iterator objects Per comments on Ia402698e Change-Id: Iffcbb3a62306a6e3b31fe45fcf1948210f4f3641 --- M SpecialGadgets.php 1 file changed, 6 insertions(+), 6 deletions(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/SpecialGadgets.php b/SpecialGadgets.php index 2d971f6..c30acc4 100644 --- a/SpecialGadgets.php +++ b/SpecialGadgets.php @@ -349,10 +349,10 @@ $descriptionMessage = Title::makeTitleSafe( NS_MEDIAWIKI, $gadget->getDescriptionMessageKey() ); // Add these pages and their subpages (for translations) $exportTitles = array_merge( $exportTitles, - $titleMessage, - $titleMessage->getSubpages(), - $descriptionMessage, - $descriptionMessage->getSubpages() + array( $titleMessage ), + iterator_to_array( $titleMessage->getSubpages() ), + array( $descriptionMessage ), + iterator_to_array( $descriptionMessage->getSubpages() ) ); // Module script and styles in NS_GADGET @@ -369,8 +369,8 @@ $message = Title::makeTitleSafe( NS_MEDIAWIKI, $message ); // Add this page and its subpages (for translations) $exportTitles = array_merge( $exportTitles, - $message, // @fixme this should be an array? - $message->getSubpages() + array( $message ), + iterator_to_array( $message->getSubpages() ) ); } -- To view, visit https://gerrit.wikimedia.org/r/155898 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iffcbb3a62306a6e3b31fe45fcf1948210f4f3641 Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/Gadgets Gerrit-Branch: RL2 Gerrit-Owner: Alex Monk <kren...@wikimedia.org> Gerrit-Reviewer: Catrope <roan.katt...@gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits