Fix major display regression for CSS 1 browsers like IE5 (see wikien-l).

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index f72c660..a0b7688 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -22,6 +22,7 @@ class RawPage {
 
        function RawPage( &$article, $request = false ) {
                global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
+               global $wgUser;
 
                $allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
                $this->mArticle =& $article;
@@ -81,6 +82,12 @@ class RawPage {
                $this->mCharset = $wgInputEncoding;
                $this->mSmaxage = intval( $smaxage );
                $this->mMaxage = $maxage;
+               
+               // Output may contain user-specific data; vary for open sessions
+               $this->mPrivateCache = ( $this->mSmaxage == 0 ) ||
+                       ( isset( $_COOKIE[ini_get( 'session.name' )] ) ||
+                       $wgUser->isLoggedIn() );
+               
                if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
                        $this->mContentType = 'text/x-wiki';
                } else {
@@ -128,13 +135,14 @@ class RawPage {
 
                header( "Content-type: ".$this->mContentType.'; charset='.$this->mCharset );
                # allow the client to cache this for 24 hours
-               header( 'Cache-Control: s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
+               $mode = $this->mPrivateCache ? 'private' : 'public';
+               header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
                echo $this->getRawText();
                $wgOut->disable();
        }
 
        function getRawText() {
-               global $wgUser, $wgOut;
+               global $wgUser, $wgOut, $wgRequest;
                if($this->mGen) {
                        $sk = $wgUser->getSkin();
                        $sk->initPage($wgOut);
@@ -157,7 +165,7 @@ class RawPage {
                                $key = $this->mTitle->getDBkey();
                                $text = wfMsgForContentNoTrans( $key );
                                # If the message doesn't exist, return a blank
-                               if( $text == '<' . $key . '>' )
+                               if( wfEmptyMsg( $key, $text ) )
                                        $text = '';
                                $found = true;
                        } else {
@@ -189,14 +197,8 @@ class RawPage {
                        return '';
                else
                        if ( $this->mExpandTemplates ) {
-                               global $wgTitle;
-
-                               $parser = new Parser();
-                               $parser->Options( new ParserOptions() ); // We don't want this to be user-specific
-                               $parser->Title( $wgTitle );
-                               $parser->OutputType( OT_HTML );
-
-                               return $parser->replaceVariables( $text );
+                               global $wgParser;
+                               return $wgParser->preprocess( $text, $this->mTitle, new ParserOptions() );
                        } else
                                return $text;
        }