Tim Starling has uploaded a new change for review. https://gerrit.wikimedia.org/r/266187
Change subject: Introduce ParserOutput::getRawText() ...................................................................... Introduce ParserOutput::getRawText() Avoid polluting the parser cache with skin-dependent output from Skin::doEditSectionLink() by introducing getRawText(), which provides access to the uncooked text. Use this in WikitextContent::fillParserOutput() which is the primary offender judging by the debug logs (see referenced bug). Bug: T124356 Change-Id: Ia9e1e4a6dc3a26f88eeebc64eed023ff20c53d58 --- M includes/content/WikitextContent.php M includes/parser/ParserOutput.php 2 files changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/87/266187/1 diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php index 8beae39..89e9356 100644 --- a/includes/content/WikitextContent.php +++ b/includes/content/WikitextContent.php @@ -338,7 +338,7 @@ $chain = $this->getRedirectChain(); $output->setText( Article::getRedirectHeaderHtml( $title->getPageLanguage(), $chain, false ) . - $output->getText() + $output->getRawText() ); $output->addModuleStyles( 'mediawiki.action.view.redirectPage' ); } diff --git a/includes/parser/ParserOutput.php b/includes/parser/ParserOutput.php index 72668bf..656e580 100644 --- a/includes/parser/ParserOutput.php +++ b/includes/parser/ParserOutput.php @@ -220,6 +220,17 @@ $this->mTitleText = $titletext; } + /** + * Get the cacheable text with <mw:editsection> markers still in it. The + * return value is suitable for writing back via setText() but is not valid + * for display to the user. + * + * @since 1.27 + */ + public function getRawText() { + return $this->mText; + } + public function getText() { $text = $this->mText; if ( $this->mEditSectionTokens ) { -- To view, visit https://gerrit.wikimedia.org/r/266187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia9e1e4a6dc3a26f88eeebc64eed023ff20c53d58 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Tim Starling <tstarl...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits