http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69380
Revision: 69380
Author: catrope
Date: 2010-07-15 09:41:46 +0000 (Thu, 15 Jul 2010)
Log Message:
-----------
1.16wmf4: MFT r69347, r69350, r69369, r69379
Modified Paths:
--------------
branches/wmf/1.16wmf4/includes/api/ApiMain.php
branches/wmf/1.16wmf4/includes/api/ApiParse.php
branches/wmf/1.16wmf4/includes/api/ApiQueryDeletedrevs.php
branches/wmf/1.16wmf4/includes/api/ApiQueryLogEvents.php
branches/wmf/1.16wmf4/includes/api/ApiQueryProtectedTitles.php
branches/wmf/1.16wmf4/includes/api/ApiQueryRecentChanges.php
branches/wmf/1.16wmf4/includes/api/ApiQueryRevisions.php
branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php
Modified: branches/wmf/1.16wmf4/includes/api/ApiMain.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiMain.php 2010-07-15 09:25:58 UTC
(rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiMain.php 2010-07-15 09:41:46 UTC
(rev 69380)
@@ -262,7 +262,7 @@
header( 'Vary: Cookie' );
if ( $wgUseXVO ) {
header( $wgOut->getXVO() );
- if ( $wgOut->hasCacheVaryCookies() ) {
+ if ( $wgOut->haveCacheVaryCookies() ) {
$this->setCacheControl( array(
'private' => true ) );
}
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiParse.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiParse.php 2010-07-15 09:25:58 UTC
(rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiParse.php 2010-07-15 09:41:46 UTC
(rev 69380)
@@ -145,6 +145,7 @@
if ( !is_null( $params['summary'] ) ) {
$result_array['parsedsummary'] = array();
+ $this->getMain()->setVaryCookie();
$result->setContent( $result_array['parsedsummary'],
$wgUser->getSkin()->formatComment( $params['summary'], $titleObj ) );
}
@@ -173,6 +174,7 @@
if ( isset( $prop['headhtml'] ) ) {
$out = new OutputPage;
$out->addParserOutputNoText( $p_result );
+ $this->getMain()->setVaryCookie();
$result_array['headhtml'] = array();
$result->setContent( $result_array['headhtml'],
$out->headElement( $wgUser->getSkin() ) );
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryDeletedrevs.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryDeletedrevs.php 2010-07-15
09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryDeletedrevs.php 2010-07-15
09:41:46 UTC (rev 69380)
@@ -200,6 +200,7 @@
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 )
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryLogEvents.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryLogEvents.php 2010-07-15
09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryLogEvents.php 2010-07-15
09:41:46 UTC (rev 69380)
@@ -267,6 +267,7 @@
if ( $this->fld_parsedcomment ) {
global $wgUser;
+ $this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $row->log_comment, $title );
}
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryProtectedTitles.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryProtectedTitles.php
2010-07-15 09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryProtectedTitles.php
2010-07-15 09:41:46 UTC (rev 69380)
@@ -100,6 +100,7 @@
if ( isset( $prop['parsedcomment'] ) ) {
global $wgUser;
+ $this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $row->pt_reason, $title );
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryRecentChanges.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryRecentChanges.php
2010-07-15 09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryRecentChanges.php
2010-07-15 09:41:46 UTC (rev 69380)
@@ -362,6 +362,7 @@
if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) {
global $wgUser;
+ $this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $row->rc_comment, $title );
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryRevisions.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryRevisions.php 2010-07-15
09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryRevisions.php 2010-07-15
09:41:46 UTC (rev 69380)
@@ -378,6 +378,7 @@
if ( $this->fld_parsedcomment ) {
global $wgUser;
+
$this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $comment, $title );
}
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
2010-07-15 09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryUserContributions.php
2010-07-15 09:41:46 UTC (rev 69380)
@@ -314,6 +314,7 @@
if ( $this->fld_parsedcomment ) {
global $wgUser;
+ $this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $row->rev_comment, $title );
}
}
Modified: branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php
===================================================================
--- branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php 2010-07-15
09:25:58 UTC (rev 69379)
+++ branches/wmf/1.16wmf4/includes/api/ApiQueryWatchlist.php 2010-07-15
09:41:46 UTC (rev 69380)
@@ -282,6 +282,7 @@
if ( $this->fld_parsedcomment && isset( $row->rc_comment ) ) {
global $wgUser;
+ $this->getMain()->setVaryCookie();
$vals['parsedcomment'] =
$wgUser->getSkin()->formatComment( $row->rc_comment, $title );
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
