jenkins-bot has submitted this change and it was merged.
Change subject: ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs were
removed
......................................................................
ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs were removed
Bug: T145728
Change-Id: Iddf29005abbaceaa1e3cc2c79e4becfb46294414
---
M RELEASE-NOTES-1.29
M docs/hooks.txt
M includes/EditPage.php
M includes/diff/DifferenceEngine.php
M includes/page/Article.php
5 files changed, 4 insertions(+), 98 deletions(-)
Approvals:
Daniel Kinzler: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29
index ab7cdd4..f135029 100644
--- a/RELEASE-NOTES-1.29
+++ b/RELEASE-NOTES-1.29
@@ -64,6 +64,8 @@
were removed.
* Article::getAutosummary() and WikiPage::getAutosummary (deprecated in 1.21)
were removed.
+* Hooks ArticleViewCustom, EditPageGetDiffText and ShowRawCssJs (deprecated in
1.21)
+ were removed.
== Compatibility ==
diff --git a/docs/hooks.txt b/docs/hooks.txt
index da12d8c..0254e06 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -774,14 +774,6 @@
&$sectionanchor: The section anchor link (e.g. "#overview" )
&$extraq: Extra query parameters which can be added via hooked functions
-'ArticleViewCustom': DEPRECATED! Use ArticleContentViewCustom instead.
-Allows to output the text of the article in a different format than wikitext.
-Note that it is preferable to implement proper handing for a custom data type
-using the ContentHandler facility.
-$text: text of the page
-$title: title of the page
-$output: reference to $wgOut
-
'ArticleViewFooter': After showing the footer section of an ordinary page view
$article: Article object
$patrolFooterShown: boolean whether patrol footer is shown
@@ -1414,13 +1406,6 @@
'EditPageGetDiffContent': Allow modifying the wikitext that will be used in
"Show changes". Note that it is preferable to implement diff handling for
different data types using the ContentHandler facility.
-$editPage: EditPage object
-&$newtext: wikitext that will be used as "your version"
-
-'EditPageGetDiffText': DEPRECATED! Use EditPageGetDiffContent instead.
-Allow modifying the wikitext that will be used in "Show changes". Note that it
-is preferable to implement diff handling for different data types using the
-ContentHandler facility.
$editPage: EditPage object
&$newtext: wikitext that will be used as "your version"
@@ -2840,12 +2825,6 @@
'ShowMissingArticle': Called when generating the output for a non-existent
page.
$article: The article object corresponding to the page
-
-'ShowRawCssJs': DEPRECATED! Use the ContentGetParserOutput hook instead.
-Customise the output of raw CSS and JavaScript in page views.
-$text: Text being shown
-$title: Title of the custom script/stylesheet page
-$output: Current OutputPage object
'ShowSearchHit': Customize display of search hit.
$searchPage: The SpecialSearch instance.
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 745f8de..f37ce34 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3326,7 +3326,6 @@
}
if ( $newContent ) {
- ContentHandler::runLegacyHooks( 'EditPageGetDiffText',
[ $this, &$newContent ], '1.21' );
Hooks::run( 'EditPageGetDiffContent', [ $this,
&$newContent ] );
$popts = ParserOptions::newFromUserAndLang( $wgUser,
$wgContLang );
diff --git a/includes/diff/DifferenceEngine.php
b/includes/diff/DifferenceEngine.php
index a5a8676..bd65fb4 100644
--- a/includes/diff/DifferenceEngine.php
+++ b/includes/diff/DifferenceEngine.php
@@ -601,28 +601,7 @@
$out->setRevisionTimestamp(
$this->mNewRev->getTimestamp() );
$out->setArticleFlag( true );
- // NOTE: only needed for B/C: custom rendering of
JS/CSS via hook
- if ( $this->mNewPage->isCssJsSubpage() ||
$this->mNewPage->isCssOrJsPage() ) {
- // This needs to be synchronised with
Article::showCssOrJsPage(), which sucks
- // Give hooks a chance to customise the output
- // @todo standardize this crap into one function
- if ( ContentHandler::runLegacyHooks(
'ShowRawCssJs', [ $this->mNewContent, $this->mNewPage, $out ], '1.24' ) ) {
- // NOTE: deprecated hook, B/C only
- // use the content object's own
rendering
- $cnt = $this->mNewRev->getContent();
- $po = $cnt ? $cnt->getParserOutput(
$this->mNewRev->getTitle(), $this->mNewRev->getId() ) : null;
- if ( $po ) {
- $out->addParserOutputContent(
$po );
- }
- }
- } elseif ( !Hooks::run( 'ArticleContentViewCustom', [
$this->mNewContent, $this->mNewPage, $out ] ) ) {
- // Handled by extension
- } elseif ( !ContentHandler::runLegacyHooks(
- 'ArticleViewCustom',
- [ $this->mNewContent, $this->mNewPage, $out ],
- '1.21'
- ) ) {
- // NOTE: deprecated hook, B/C only
+ if ( !Hooks::run( 'ArticleContentViewCustom', [
$this->mNewContent, $this->mNewPage, $out ] ) ) {
// Handled by extension
} else {
// Normal page
diff --git a/includes/page/Article.php b/includes/page/Article.php
index d30f034..cc3ef26 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -621,21 +621,9 @@
# Preload timestamp to avoid a DB hit
$outputPage->setRevisionTimestamp(
$this->mPage->getTimestamp() );
- # Pages containing custom CSS or
JavaScript get special treatment
- if ( $this->getTitle()->isCssOrJsPage()
|| $this->getTitle()->isCssJsSubpage() ) {
- wfDebug( __METHOD__ . ":
showing CSS/JS source\n" );
- $this->showCssOrJsPage();
- $outputDone = true;
- } elseif ( !Hooks::run(
'ArticleContentViewCustom',
+ if ( !Hooks::run(
'ArticleContentViewCustom',
[
$this->fetchContentObject(), $this->getTitle(), $outputPage ] ) ) {
- # Allow extensions do their own
custom view for certain pages
- $outputDone = true;
- } elseif (
!ContentHandler::runLegacyHooks(
- 'ArticleViewCustom',
- [ $this->fetchContentObject(),
$this->getTitle(), $outputPage ],
- '1.21'
- ) ) {
# Allow extensions do their own
custom view for certain pages
$outputDone = true;
}
@@ -779,47 +767,6 @@
list( $old, $new ) = $de->mapDiffPrevNext( $oldid, $diff );
// New can be false, convert it to 0 - this conveniently means
the latest revision
$this->mPage->doViewUpdates( $user, (int)$new );
- }
-
- /**
- * Show a page view for a page formatted as CSS or JavaScript. To be
called by
- * Article::view() only.
- *
- * This exists mostly to serve the deprecated ShowRawCssJs hook (used
to customize these views).
- * It has been replaced by the ContentGetParserOutput hook, which lets
you do the same but with
- * more flexibility.
- *
- * @param bool $showCacheHint Whether to show a message telling the user
- * to clear the browser cache (default: true).
- */
- protected function showCssOrJsPage( $showCacheHint = true ) {
- $outputPage = $this->getContext()->getOutput();
-
- if ( $showCacheHint ) {
- $dir = $this->getContext()->getLanguage()->getDir();
- $lang =
$this->getContext()->getLanguage()->getHtmlCode();
-
- $outputPage->wrapWikiMsg(
- "<div id='mw-clearyourcache' lang='$lang'
dir='$dir' class='mw-content-$dir'>\n$1\n</div>",
- 'clearyourcache'
- );
- }
-
- $this->fetchContentObject();
-
- if ( $this->mContentObject ) {
- // Give hooks a chance to customise the output
- if ( ContentHandler::runLegacyHooks(
- 'ShowRawCssJs',
- [ $this->mContentObject, $this->getTitle(),
$outputPage ],
- '1.24'
- ) ) {
- // If no legacy hooks ran, display the content
of the parser output, including RL modules,
- // but excluding metadata like categories and
language links
- $po = $this->mContentObject->getParserOutput(
$this->getTitle() );
- $outputPage->addParserOutputContent( $po );
- }
- }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/324710
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iddf29005abbaceaa1e3cc2c79e4becfb46294414
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
Gerrit-Reviewer: Daniel Kinzler <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: Tpt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
