fetch commons descriptions for display on local wikis

[lhc/web/wiklou.git] / includes / OutputPage.php

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index fe8ff5d..f58fde9 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -21,9 +21,9 @@ class OutputPage {
        var $mLinktags, $mPagetitle, $mBodytext, $mDebugtext;
        var $mHTMLtitle, $mRobotpolicy, $mIsarticle, $mPrintable;
        var $mSubtitle, $mRedirect;
-       var $mLastModified, $mCategoryLinks;
+       var $mLastModified, $mETag, $mCategoryLinks;
        var $mScripts, $mLinkColours;
-       
+
        var $mSuppressQuickbar;
        var $mOnloadHandler;
        var $mDoNothing;
@@ -32,6 +32,7 @@ class OutputPage {
        var $mParserOptions;
        var $mShowFeedLinks = false;
        var $mEnableClientCache = true;
+       var $mArticleBodyOnly = false;
 
        /**
         * Constructor
@@ -53,6 +54,7 @@ class OutputPage {
                $this->mParserOptions = ParserOptions::newFromUser( $temp = NULL );
                $this->mSquidMaxage = 0;
                $this->mScripts = '';
+               $this->mETag = false;
        }
 
        function addHeader( $name, $val ) { array_push( $this->mHeaders, $name.': '.$val ) ; }
@@ -65,6 +67,9 @@ class OutputPage {
        function addScript( $script ) { $this->mScripts .= $script; }
        function getScript() { return $this->mScripts; }
 
+       function setETag($tag) { $this->mETag = $tag; }
+       function setArticleBodyOnly($only) { $this->mArticleBodyOnly = $only; }
+
        function addLink( $linkarr ) {
                # $linkarr should be an associative array of attributes. We'll escape on output.
                array_push( $this->mLinktags, $linkarr );
@@ -170,7 +175,7 @@ class OutputPage {
        }
        function getHTMLTitle() { return $this->mHTMLtitle; }
        function getPageTitle() { return $this->mPagetitle; }
-       function setSubtitle( $str ) { $this->mSubtitle = $str; }
+       function setSubtitle( $str ) { $this->mSubtitle = /*$this->parse(*/$str/*)*/; } // @bug 2514
        function getSubtitle() { return $this->mSubtitle; }
        function isArticle() { return $this->mIsarticle; }
        function setPrintable() { $this->mPrintable = true; }
@@ -239,7 +244,7 @@ class OutputPage {
        function addWikiTextWithTitle($text, &$title, $linestart = true) {
                $this->addWikiTextTitle($text, $title, $linestart);
        }
-       
+
        function addWikiTextTitle($text, &$title, $linestart) {
                global $wgParser, $wgUseTidy;
                $parserOutput = $wgParser->parse( $text, $title, $this->mParserOptions, $linestart );
@@ -249,8 +254,8 @@ class OutputPage {
                        $this->enableClientCache( false );
                }
                $this->addHTML( $parserOutput->getText() );
-       }       
-               
+       }
+
        /**
         * Add wikitext to the buffer, assuming that this is the primary text for a page view
         * Saves the text into the parser cache if possible
@@ -261,7 +266,7 @@ class OutputPage {
                $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, true );
 
                $text = $parserOutput->getText();
-               
+
                if ( $cacheArticle && $parserOutput->getCacheTime() != -1 ) {
                        $wgParserCache->save( $parserOutput, $cacheArticle, $wgUser );
                }
@@ -293,7 +298,7 @@ class OutputPage {
                $parserOutput = $wgParser->parse( $text, $wgTitle, $this->mParserOptions, $linestart );
                return $parserOutput->getText();
        }
-       
+
        /**
         * @param $article
         * @param $user
@@ -335,6 +340,10 @@ class OutputPage {
 
        function sendCacheControl() {
                global $wgUseSquid, $wgUseESI;
+
+               if ($this->mETag)
+                       header("ETag: $this->mETag");
+
                # don't serve compressed data to clients who can't handle it
                # maintain different caches for logged-in users and non-logged in ones
                header( 'Vary: Accept-Encoding, Cookie' );
@@ -428,7 +437,7 @@ class OutputPage {
                ob_start();
 
                $this->transformBuffer();
-               
+
                # Disable temporary placeholders, so that the skin produces HTML
                $sk->postParseLinkColour( false );
 
@@ -440,10 +449,14 @@ class OutputPage {
                        setcookie( $name, $val, $exp, '/' );
                }
 
-               wfProfileIn( 'Output-skin' );
-               $sk->outputPage( $this );
-               wfProfileOut( 'Output-skin' );
-               
+               if ($this->mArticleBodyOnly) {
+                       $this->out($this->mBodytext);
+               } else {
+                       wfProfileIn( 'Output-skin' );
+                       $sk->outputPage( $this );
+                       wfProfileOut( 'Output-skin' );
+               }
+
                $this->sendCacheControl();
                ob_end_flush();
        }
@@ -531,6 +544,26 @@ class OutputPage {
                wfErrorExit();
        }
 
+       /**
+        * Display an error page indicating that a given version of MediaWiki is
+        * required to use it
+        *
+        * @param mixed $version The version of MediaWiki needed to use the page
+        */
+       function versionRequired( $version ) {
+               global $wgUser;
+
+               $this->setPageTitle( wfMsg( 'versionrequired', $version ) );
+               $this->setHTMLTitle( wfMsg( 'versionrequired', $version ) );
+               $this->setRobotpolicy( 'noindex,nofollow' );
+               $this->setArticleRelated( false );
+               $this->mBodytext = '';
+
+               $sk = $wgUser->getSkin();
+               $this->addWikiText( wfMsg( 'versionrequiredtext', $version ) );
+               $this->returnToMain();
+       }
+
        /**
         * Display an error page noting that a given permission bit is required.
         * This should generally replace the sysopRequired, developerRequired etc.
@@ -550,7 +583,7 @@ class OutputPage {
                $this->addHTML( wfMsgHtml( 'badaccesstext', $ap, $permission ) );
                $this->returnToMain();
        }
-       
+
        /**
         * @deprecated
         */
@@ -833,14 +866,14 @@ class OutputPage {
 
                return $ret;
        }
-       
+
        /**
         * Run any necessary pre-output transformations on the buffer text
         */
        function transformBuffer( $options = 0 ) {
        }
 
-       
+
        /**
         * Turn off regular page output and return an error reponse
         * for when rate limiting has triggered.