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

Change subject: Revert "Revert "Use WikiPage::prepareContentForEdit in 
SpamBlacklistHooks::filterMergedContent""
......................................................................


Revert "Revert "Use WikiPage::prepareContentForEdit in 
SpamBlacklistHooks::filterMergedContent""

Ie71ebdeb should fix the bug in Wikibase that prompted the original
reversion.

This reverts commit 2745442aec0437d719bfad3b7a81580d2bf10fa8.

Change-Id: I085996669db7e0fcbf839b8d38d020c8d2e09220
---
M SpamBlacklistHooks.php
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  Aaron Schulz: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/SpamBlacklistHooks.php b/SpamBlacklistHooks.php
index 223c106..0ceb4fa 100644
--- a/SpamBlacklistHooks.php
+++ b/SpamBlacklistHooks.php
@@ -25,8 +25,8 @@
                }
 
                // get the link from the not-yet-saved page content.
-               // no need to generate html to get external links
-               $pout = $content->getParserOutput( $title, null, null, false );
+               $editInfo = $context->getWikiPage()->prepareContentForEdit( 
$content );
+               $pout = $editInfo->output;
                $links = array_keys( $pout->getExternalLinks() );
 
                // HACK: treat the edit summary as a link

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I085996669db7e0fcbf839b8d38d020c8d2e09220
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/SpamBlacklist
Gerrit-Branch: master
Gerrit-Owner: Anomie <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: Anomie <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Hoo man <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to