diff --git a/RELEASE-NOTES-1.38 b/RELEASE-NOTES-1.38 index b50d6f210a4..3105326bc30 100644 --- a/RELEASE-NOTES-1.38 +++ b/RELEASE-NOTES-1.38 @@ -83,6 +83,7 @@ because of Phabricator reports. 1.35, have been removed. * TemplateParser used to support disabling the cache with a boolean parameter in its constructor. This was deprecated in 1.35 and has now been removed. +* The ArticleUndeleteLogEntry hook, deprecated in 1.37, was removed. * The global function mimeTypeMatch() has been removed without a deprecation process. * The signature of PageUpdater::markAsRevert method was changed. It has never diff --git a/includes/HookContainer/DeprecatedHooks.php b/includes/HookContainer/DeprecatedHooks.php index d42a7b3a5ac..f8a4bfa0df5 100644 --- a/includes/HookContainer/DeprecatedHooks.php +++ b/includes/HookContainer/DeprecatedHooks.php @@ -35,7 +35,6 @@ class DeprecatedHooks { */ private $deprecatedHooks = [ 'AddNewAccount' => [ 'deprecatedVersion' => '1.27', 'silent' => true ], - 'ArticleUndeleteLogEntry' => [ 'deprecatedVersion' => '1.37' ], 'BaseTemplateAfterPortlet' => [ 'deprecatedVersion' => '1.35' ], 'BeforeParserFetchTemplateAndtitle' => [ 'deprecatedVersion' => '1.36' ], 'BeforeParserrenderImageGallery' => [ 'deprecatedVersion' => '1.35' ], diff --git a/includes/HookContainer/HookRunner.php b/includes/HookContainer/HookRunner.php index c93aa475bf2..4a2d1037d5a 100644 --- a/includes/HookContainer/HookRunner.php +++ b/includes/HookContainer/HookRunner.php @@ -436,7 +436,6 @@ class HookRunner implements \MediaWiki\Page\Hook\ArticleRevisionViewCustomHook, \MediaWiki\Page\Hook\ArticleShowPatrolFooterHook, \MediaWiki\Page\Hook\ArticleUndeleteHook, - \MediaWiki\Page\Hook\ArticleUndeleteLogEntryHook, \MediaWiki\Page\Hook\ArticleViewFooterHook, \MediaWiki\Page\Hook\ArticleViewHeaderHook, \MediaWiki\Page\Hook\ArticleViewRedirectHook, @@ -826,13 +825,6 @@ class HookRunner implements ); } - public function onArticleUndeleteLogEntry( $pageArchive, &$logEntry, $user ) { - return $this->container->run( - 'ArticleUndeleteLogEntry', - [ $pageArchive, &$logEntry, $user ] - ); - } - public function onArticleUpdateBeforeRedirect( $article, &$sectionanchor, &$extraq ) { diff --git a/includes/page/Hook/ArticleUndeleteLogEntryHook.php b/includes/page/Hook/ArticleUndeleteLogEntryHook.php deleted file mode 100644 index cfa19c30c66..00000000000 --- a/includes/page/Hook/ArticleUndeleteLogEntryHook.php +++ /dev/null @@ -1,28 +0,0 @@ -userFactory->newFromUserIdentity( $user ); - $this->hookRunner->onArticleUndeleteLogEntry( $this, $logEntry, $legacyUser ); - $logid = $logEntry->insert(); $logEntry->publish( $logid );