[MediaWiki-commits] [Gerrit] Fixed preview caching polluting parser cache - change (mediawiki...Graph)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fixed preview caching polluting parser cache
......................................................................


Fixed preview caching polluting parser cache

Bug: T119779
Change-Id: I00b45ed7c06f66241b4831613a9ac96776de63d7
---
M includes/Graph.body.php
1 file changed, 8 insertions(+), 4 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Graph.body.php b/includes/Graph.body.php
index 051ca58..6cf80c6 100644
--- a/includes/Graph.body.php
+++ b/includes/Graph.body.php
@@ -40,8 +40,7 @@
        }
 
        public static function onParserAfterParse( Parser $parser ) {
-               self::finalizeParserOutput( $parser->getOutput(), 
$parser->getTitle(),
-                       $parser->getOptions()->getIsPreview() );
+               self::finalizeParserOutput( $parser, $parser->getTitle(), 
$parser->getOutput() );
                return true;
        }
 
@@ -61,7 +60,7 @@
                        $parser->getOutput(), 
$parser->getOptions()->getIsPreview(), $args );
        }
 
-       public static function finalizeParserOutput( ParserOutput $output, 
$title, $isPreview ) {
+       public static function finalizeParserOutput( Parser $parser, $title, 
ParserOutput $output ) {
                if ( $output->getExtensionData( 'graph_specs_broken' ) ) {
                        $output->addTrackingCategory( 'graph-broken-category', 
$title );
                }
@@ -86,6 +85,11 @@
 
                        $liveSpecs = $output->getExtensionData( 
'graph_live_specs' );
                        $interact = $output->getExtensionData( 'graph_interact' 
);
+
+                       if ( $parser->getOptions()->getIsPreview() ) {
+                               // Preview generates HTML that is different 
from normal
+                               $parser->disableCache();
+                       }
 
                        if ( $liveSpecs || $interact ) {
                                // TODO: these 3 js vars should be per domain 
if 'ext.graph' is added, not per page
@@ -266,6 +270,6 @@
                $output->setText( $html );
 
                // Since we invoke parser manually, the ParserAfterParse never 
gets called, do it manually
-               Singleton::finalizeParserOutput( $output, $title, 
$options->getIsPreview() );
+               Singleton::finalizeParserOutput( $parser, $title, $output );
        }
 }

-- 
To view, visit https://gerrit.wikimedia.org/r/263039
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I00b45ed7c06f66241b4831613a9ac96776de63d7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Graph
Gerrit-Branch: master
Gerrit-Owner: Yurik <yu...@wikimedia.org>
Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits