re r64403 - remove never-actually-used $flag parameter from verifyUpload()

[lhc/web/wiklou.git] / includes / api / ApiParse.php

diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 2f61c48..ae419a8 100644 (file)
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -50,7 +50,6 @@ class ApiParse extends ApiBase {
                        $this->dieUsage( 'The page parameter cannot be used together with the text and title parameters', 'params' );
                }
                $prop = array_flip( $params['prop'] );
-               $revid = false;
 
                if ( isset( $params['section'] ) ) {
                        $this->section = $params['section'];
@@ -138,7 +137,7 @@ class ApiParse extends ApiBase {
                                        $p_result = false;
                                        $pcache = ParserCache::singleton();
                                        if ( $wgEnableParserCache ) {
-                                               $p_result = $pcache->get( $articleObj, $wgUser );
+                                               $p_result = $pcache->get( $articleObj, $popts );
                                        }
                                        if ( !$p_result ) {
                                                $p_result = $wgParser->parse( $articleObj->getContent(), $titleObj, $popts );
@@ -162,6 +161,7 @@ class ApiParse extends ApiBase {
 
                        if ( $params['pst'] || $params['onlypst'] ) {
                                $text = $wgParser->preSaveTransform( $text, $titleObj, $wgUser, $popts );
+                               $this->getMain()->setVaryCookie();
                        }
                        if ( $params['onlypst'] ) {
                                // Build a result and bail out
@@ -187,6 +187,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 ) );
                }
 
@@ -221,6 +222,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();
                }
 
@@ -452,7 +454,7 @@ class ApiParse extends ApiBase {
                        array( 'code' => 'missingrev', 'info' => 'There is no revision ID oldid' ),
                        array( 'code' => 'permissiondenied', 'info' => 'You don\'t have permission to view deleted revisions' ),
                        array( 'code' => 'missingtitle', 'info' => 'The page you specified doesn\'t exist' ),
-                       array( 'code' => 'nosuchsection', 'info' => 'There is no section sectionnumber in page'),
+                       array( 'code' => 'nosuchsection', 'info' => 'There is no section sectionnumber in page' ),
                        array( 'nosuchpageid' ),
                ) );
        }