Tim Starling has uploaded a new change for review.
https://gerrit.wikimedia.org/r/266183
Change subject: Revert Temp log #1 and #2 for T124356
......................................................................
Revert Temp log #1 and #2 for T124356
This reverts commit 94b0ac57bf05158709e120642f3718077f10b5c3.
This reverts commit 7ae8d4aee0f4203124f7fcf1d5156372aa18ae2f.
Change-Id: If00fc034040292435ca4be7d4952c84c27f99fe2
---
M includes/OutputPage.php
M includes/parser/ParserCache.php
2 files changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/83/266183/1
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 6bf22ac..93ba702 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1765,8 +1765,6 @@
* @param ParserOutput $parserOutput
*/
public function addParserOutputMetadata( $parserOutput ) {
- $parserOutput->_output_done = true;
-
$this->mLanguageLinks += $parserOutput->getLanguageLinks();
$this->addCategoryLinks( $parserOutput->getCategories() );
$this->setIndicators( $parserOutput->getIndicators() );
diff --git a/includes/parser/ParserCache.php b/includes/parser/ParserCache.php
index 550e2e7..0eba166 100644
--- a/includes/parser/ParserCache.php
+++ b/includes/parser/ParserCache.php
@@ -258,13 +258,6 @@
public function save( $parserOutput, $page, $popts, $cacheTime = null,
$revId = null ) {
$expire = $parserOutput->getCacheExpiry();
if ( $expire > 0 ) {
- if ( isset( $parserOutput->_output_done ) ) {
- wfDebugLog( 'temp-debug', 'Output before cache
save: ' . wfGetAllCallers( false ) );
- }
- if ( strpos( $parserOutput->mText, 'href="#/editor/1"'
) !== false ) {
- wfDebugLog( 'temp-debug', 'MF pollution: ' .
wfGetAllCallers( false ) );
- }
-
$cacheTime = $cacheTime ?: wfTimestampNow();
if ( !$revId ) {
$revision = $page->getRevision();
--
To view, visit https://gerrit.wikimedia.org/r/266183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If00fc034040292435ca4be7d4952c84c27f99fe2
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.27.0-wmf.11
Gerrit-Owner: Tim Starling <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
