follow up r69339:

* Add a missing setVaryCookie for consistency
* don't cache result when token is given in ApiFeedWatchlist

diff --git a/includes/api/ApiFeedWatchlist.php b/includes/api/ApiFeedWatchlist.php
index 34c6650..150294b 100644 (file)
--- a/includes/api/ApiFeedWatchlist.php
+++ b/includes/api/ApiFeedWatchlist.php
@@ -78,6 +78,9 @@ class ApiFeedWatchlist extends ApiBase {
                                $fauxReqArr['wlowner'] = $params['wlowner'];
                        }
                        if ( !is_null( $params['wltoken'] ) ) {
+                               // Don't cache tokens
+                               $this->getMain()->setCachePrivate();
+
                                $fauxReqArr['wltoken'] = $params['wltoken'];
                        }
 

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 50b9d39..01285ec 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -188,6 +188,7 @@ class ApiParse extends ApiBase {
 
                if ( !is_null( $params['summary'] ) ) {
                        $result_array['parsedsummary'] = array();
+                       $this->getMain()->setVaryCookie();
                        $result->setContent( $result_array['parsedsummary'], $wgUser->getSkin()->formatComment( $params['summary'], $titleObj ) );
                }
 
@@ -222,6 +223,7 @@ class ApiParse extends ApiBase {
                if ( isset( $prop['headitems'] ) || isset( $prop['headhtml'] ) ) {
                        $out = new OutputPage;
                        $out->addParserOutputNoText( $p_result );
+                       $this->getMain()->setVaryCookie();
                        $userSkin = $wgUser->getSkin();
                }
 

diff --git a/includes/api/ApiQueryDeletedrevs.php b/includes/api/ApiQueryDeletedrevs.php
index 9f28192..f940ff0 100644 (file)
--- a/includes/api/ApiQueryDeletedrevs.php
+++ b/includes/api/ApiQueryDeletedrevs.php
@@ -211,6 +211,7 @@ class ApiQueryDeletedrevs extends ApiQueryBase {
 
                        if ( $fld_parsedcomment ) {
                                global $wgUser;
+                               $this->getMain()->setVaryCookie();
                                $rev['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->ar_comment, $title );
                        }
                        if ( $fld_minor && $row->ar_minor_edit == 1 ) {

diff --git a/includes/api/ApiQueryProtectedTitles.php b/includes/api/ApiQueryProtectedTitles.php
index e3cac1b..5354e61 100644 (file)
--- a/includes/api/ApiQueryProtectedTitles.php
+++ b/includes/api/ApiQueryProtectedTitles.php
@@ -102,6 +102,7 @@ class ApiQueryProtectedTitles extends ApiQueryGeneratorBase {
 
                                if ( isset( $prop['parsedcomment'] ) ) {
                                        global $wgUser;
+                                       $this->getMain()->setVaryCookie();
                                        $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->pt_reason, $title );
                                }
 

diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index a9f7794..33021cd 100644 (file)
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -378,6 +378,7 @@ class ApiQueryRecentChanges extends ApiQueryBase {
 
                if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) {
                        global $wgUser;
+                       $this->getMain()->setVaryCookie();
                        $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->rc_comment, $title );
                }
 

diff --git a/includes/api/ApiQueryRevisions.php b/includes/api/ApiQueryRevisions.php
index f80b685..8a389df 100644 (file)
--- a/includes/api/ApiQueryRevisions.php
+++ b/includes/api/ApiQueryRevisions.php
@@ -395,6 +395,7 @@ class ApiQueryRevisions extends ApiQueryBase {
 
                                if ( $this->fld_parsedcomment ) {
                                        global $wgUser;
+                                       $this->getMain()->setVaryCookie();
                                        $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $comment, $title );
                                }
                        }

diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php
index 310ca76..42ac26e 100644 (file)
--- a/includes/api/ApiQueryUserContributions.php
+++ b/includes/api/ApiQueryUserContributions.php
@@ -321,6 +321,7 @@ class ApiQueryContributions extends ApiQueryBase {
 
                                if ( $this->fld_parsedcomment ) {
                                        global $wgUser;
+                                       $this->getMain()->setVaryCookie();
                                        $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->rev_comment, $title );
                                }
                        }

diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php
index ad51ca8..9339ac0 100644 (file)
--- a/includes/api/ApiQueryWatchlist.php
+++ b/includes/api/ApiQueryWatchlist.php
@@ -272,6 +272,7 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase {
 
                if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) {
                        global $wgUser;
+                       $this->getMain()->setVaryCookie();
                        $vals['parsedcomment'] = $wgUser->getSkin()->formatComment( $row->rc_comment, $title );
                }