revert erronous commit, s/:r/:e/ ...

diff --git a/includes/SpecialVersion.php b/includes/SpecialVersion.php
index 89d3fd7..305a9bb 100644 (file)
--- a/includes/SpecialVersion.php
+++ b/includes/SpecialVersion.php
@@ -44,208 +44,6 @@ class SpecialVersion {
        /**
         * @static
         */
-<?php
-/**
- * Copyright (C) 2004 Gabriel Wicke <wicke@wikidev.net>
- * http://wikidev.net/
- * Based on PageHistory and SpecialExport
- *
- * License: GPL (http://www.gnu.org/copyleft/gpl.html)
- *
- * @author Gabriel Wicke <wicke@wikidev.net>
- * @package MediaWiki
- */
-
-/** */
-require_once( 'Revision.php' );
-
-/**
- * @todo document
- * @package MediaWiki
- */
-class RawPage {
-       var $mArticle, $mTitle, $mRequest;
-       var $mOldId, $mGen, $mCharset;
-       var $mSmaxage, $mMaxage;
-       var $mContentType, $mExpandTemplates;
-
-       function RawPage( &$article, $request = false ) {
-               global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType;
-
-               $allowedCTypes = array('text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit');
-               $this->mArticle =& $article;
-               $this->mTitle =& $article->mTitle;
-
-               if ( $request === false ) {
-                       $this->mRequest =& $wgRequest;
-               } else {
-                       $this->mRequest = $request;
-               }
-
-               $ctype = $this->mRequest->getVal( 'ctype' );
-               $smaxage = $this->mRequest->getIntOrNull( 'smaxage', $wgSquidMaxage );
-               $maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage );
-               $this->mExpandTemplates = $this->mRequest->getVal( 'templates' ) === 'expand';
-               
-               $oldid = $this->mRequest->getInt( 'oldid' );
-               switch ( $wgRequest->getText( 'direction' ) ) {
-                       case 'next':
-                               # output next revision, or nothing if there isn't one
-                               if ( $oldid ) {
-                                       $oldid = $this->mTitle->getNextRevisionId( $oldid );
-                               }
-                               $oldid = $oldid ? $oldid : -1;
-                               break;
-                       case 'prev':
-                               # output previous revision, or nothing if there isn't one
-                               if ( ! $oldid ) {
-                                       # get the current revision so we can get the penultimate one
-                                       $this->mArticle->getTouched();
-                                       $oldid = $this->mArticle->mLatest;
-                               }
-                               $prev = $this->mTitle->getPreviousRevisionId( $oldid );
-                               $oldid = $prev ? $prev : -1 ;
-                               break;
-                       case 'cur':
-                               $oldid = 0;
-                               break;
-               }
-               $this->mOldId = $oldid;
-               
-               # special case for 'generated' raw things: user css/js
-               $gen = $this->mRequest->getVal( 'gen' );
-
-               if($gen == 'css') {
-                       $this->mGen = $gen;
-                       if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
-                       if($ctype == '') $ctype = 'text/css';
-               } elseif ($gen == 'js') {
-                       $this->mGen = $gen;
-                       if( is_null( $smaxage ) ) $smaxage = $wgSquidMaxage;
-                       if($ctype == '') $ctype = $wgJsMimeType;
-               } else {
-                       $this->mGen = false;
-               }
-               $this->mCharset = $wgInputEncoding;
-               $this->mSmaxage = intval( $smaxage );
-               $this->mMaxage = $maxage;
-               if ( $ctype == '' or ! in_array( $ctype, $allowedCTypes ) ) {
-                       $this->mContentType = 'text/x-wiki';
-               } else {
-                       $this->mContentType = $ctype;
-               }
-       }
-
-       function view() {
-               global $wgOut, $wgScript;
-
-               if( isset( $_SERVER['SCRIPT_URL'] ) ) {
-                       # Normally we use PHP_SELF to get the URL to the script
-                       # as it was called, minus the query string.
-                       #
-                       # Some sites use Apache rewrite rules to handle subdomains,
-                       # and have PHP set up in a weird way that causes PHP_SELF
-                       # to contain the rewritten URL instead of the one that the
-                       # outside world sees.
-                       #
-                       # If in this mode, use SCRIPT_URL instead, which mod_rewrite
-                       # provides containing the "before" URL.
-                       $url = $_SERVER['SCRIPT_URL'];
-               } else {
-                       $url = $_SERVER['PHP_SELF'];
-               }
-               
-               $ua = @$_SERVER['HTTP_USER_AGENT'];
-               if( strcmp( $wgScript, $url ) && strpos( $ua, 'MSIE' ) !== false ) {
-                       # Internet Explorer will ignore the Content-Type header if it
-                       # thinks it sees a file extension it recognizes. Make sure that
-                       # all raw requests are done through the script node, which will
-                       # have eg '.php' and should remain safe.
-                       #
-                       # We used to redirect to a canonical-form URL as a general
-                       # backwards-compatibility / good-citizen nice thing. However
-                       # a lot of servers are set up in buggy ways, resulting in
-                       # redirect loops which hang the browser until the CSS load
-                       # times out.
-                       #
-                       # Just return a 403 Forbidden and get it over with.
-                       wfHttpError( 403, 'Forbidden',
-                               'Raw pages must be accessed through the primary script entry point.' );
-                       return;
-               }
-
-               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 );
-               echo $this->getRawText();
-               $wgOut->disable();
-       }
-
-       function getRawText() {
-               global $wgUser, $wgOut;
-               if($this->mGen) {
-                       $sk = $wgUser->getSkin();
-                       $sk->initPage($wgOut);
-                       if($this->mGen == 'css') {
-                               return $sk->getUserStylesheet();
-                       } else if($this->mGen == 'js') {
-                               return $sk->getUserJs();
-                       }
-               } else {
-                       return $this->getArticleText();
-               }
-       }
-
-       function getArticleText() {
-               if( $this->mTitle ) {
-                       $text = '';
-
-                       // If it's a MediaWiki message we can just hit the message cache
-                       if ( $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
-                               $text = wfMsgForContentNoTrans( $this->mTitle->getDbkey() );
-                       } else {
-                               // Get it from the DB
-                               $rev = Revision::newFromTitle( $this->mTitle, $this->mOldId );
-                               if ( $rev ) {
-                                       $lastmod = wfTimestamp( TS_RFC2822, $rev->getTimestamp() );
-                                       header( "Last-modified: $lastmod" );
-                                       $text = $rev->getText();
-                               } else
-                                       $text = '';
-                       }
-
-                       return $this->parseArticleText( $text );
-               }
-
-               # Bad title or page does not exist
-               if( $this->mContentType == 'text/x-wiki' ) {
-                       # Don't return a 404 response for CSS or JavaScript;
-                       # 404s aren't generally cached and it would create
-                       # extra hits when user CSS/JS are on and the user doesn't
-                       # have the pages.
-                       header( "HTTP/1.0 404 Not Found" );
-               }
-               return '';
-       }
-
-       function parseArticleText( $text ) {
-               if ( $text === '' )
-                       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 );
-                       } else
-                               return $text;
-       }
-}
-?>
        function MediaWikiCredits() {
                global $wgVersion;