Skip to content

PLATFORM-11206: Revert Hooks.php to stock version #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harnash merged 1 commit into from
Sep 25, 2025
Merged

PLATFORM-11206: Revert Hooks.php to stock version #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 17 additions & 20 deletions includes/Hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
use MediaWiki\Extension\DynamicPageList3\Maintenance\CreateView;
use MediaWiki\Installer\DatabaseUpdater;
use MediaWiki\Parser\Parser;
use MediaWiki\Parser\ParserOutputLinkTypes;
use MediaWiki\Parser\PPFrame;
use MediaWiki\Registration\ExtensionRegistry;

Expand Down Expand Up @@ -219,22 +218,23 @@ private static function executeTag( $input, array $args, Parser $parser, PPFrame

// we can remove the templates by save/restore
if ( $reset['templates'] ?? false ) {
$saveTemplates = $parserOutput->getLinkList( ParserOutputLinkTypes::TEMPLATE );
$saveTemplates = $parserOutput->mTemplates;
}

// we can remove the categories by save/restore
if ( $reset['categories'] ?? false ) {
$saveCategories = array_combine(
$parserOutput->getCategoryNames(),
array_map( static fn ( $value ) => $parserOutput->getCategorySortKey( $value ),
array_map( static fn ( $value ) =>
$parserOutput->getCategorySortKey( $value ),
$parserOutput->getCategoryNames()
)
);
}

// we can remove the images by save/restore
if ( $reset['images'] ?? false ) {
$saveImages = $parserOutput->getLinkList( ParserOutputLinkTypes::MEDIA );
$saveImages = $parserOutput->mImages;
}

$parsedDPL = $parser->recursiveTagParse( $text );
Expand Down Expand Up @@ -619,39 +619,37 @@ public static function endEliminate( $parser, &$text ) {
// called during the final output phase; removes links created by DPL
if ( self::$createdLinks ) {
if ( array_key_exists( 0, self::$createdLinks ) ) {
$parserLinks = $parser->getOutput()->getLinkList( ParserOutputLinkTypes::LOCAL );
foreach ( $parserLinks as $nsp => $link ) {
$parserLinks = $parser->getOutput()->mLinks;
foreach ( $parserLinks as $nsp => $_ ) {
if ( !array_key_exists( $nsp, self::$createdLinks[0] ) ) {
continue;
}

$mLinks = $parser->getOutput()->GetLinks();
$mLinks[$nsp] = array_diff_assoc(
$link,
$parser->getOutput()->mLinks[$nsp] = array_diff_assoc(
$parserLinks[$nsp],
self::$createdLinks[0][$nsp]
);

if ( count( $link ) == 0 ) {
unset( $mLinks[$nsp] );
if ( count( $parserLinks[$nsp] ) == 0 ) {
unset( $parser->getOutput()->mLinks[$nsp] );
}
}
}

if ( array_key_exists( 1, self::$createdLinks ) ) {
$parserTemplates = $parser->getOutput()->getLinkList( ParserOutputLinkTypes::TEMPLATE );
foreach ( $parserTemplates as $nsp => $tpl ) {
$parserTemplates = $parser->getOutput()->mTemplates;
foreach ( $parserTemplates as $nsp => $_ ) {
if ( !array_key_exists( $nsp, self::$createdLinks[1] ) ) {
continue;
}

$mTemplates = $parser->getOutput()->getTemplates();
$mTemplates[$nsp] = array_diff_assoc(
$tpl,
$parser->getOutput()->mTemplates[$nsp] = array_diff_assoc(
$parserTemplates[$nsp],
self::$createdLinks[1][$nsp]
);

if ( count( $tpl ) == 0 ) {
unset( $mTemplates[$nsp] );
if ( count( $parserTemplates[$nsp] ) == 0 ) {
unset( $parser->getOutput()->mTemplates[$nsp] );
}
}
}
Expand All @@ -669,8 +667,7 @@ public static function endEliminate( $parser, &$text ) {
}

if ( array_key_exists( 3, self::$createdLinks ) ) {
$parserMedia = $parser->getOutput()->getLinkList( ParserOutputLinkTypes::MEDIA );
$parser->getOutput()->mImages = array_diff_assoc( $parserMedia, self::$createdLinks[3] );
$parser->getOutput()->mImages = array_diff_assoc( $parser->getOutput()->mImages, self::$createdLinks[3] );
}
}
}
Expand Down