Revert r55800 "bug 19646 Localization of img_auth.php - with enhancements"

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 7093367..34aa9fe 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -109,25 +109,9 @@ class RawPage {
        }
 
        function view() {
-               global $wgOut, $wgScript;
+               global $wgOut, $wgScript, $wgRequest;
 
-               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'];
-               }
-
-               if( strcmp( $wgScript, $url ) ) {
+               if( $wgRequest->isPathInfoBad() ) {
                        # 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
@@ -141,6 +125,7 @@ class RawPage {
                        #
                        # Just return a 403 Forbidden and get it over with.
                        wfHttpError( 403, 'Forbidden',
+                               'Invalid file extension found in PATH_INFO. ' . 
                                'Raw pages must be accessed through the primary script entry point.' );
                        return;
                }
@@ -150,7 +135,8 @@ class RawPage {
                $mode = $this->mPrivateCache ? 'private' : 'public';
                header( 'Cache-Control: '.$mode.', s-maxage='.$this->mSmaxage.', max-age='.$this->mMaxage );
                
-               if( HTMLFileCache::useFileCache() ) {
+               global $wgUseFileCache;
+               if( $wgUseFileCache and HTMLFileCache::useFileCache() ) {
                        $cache = new HTMLFileCache( $this->mTitle, 'raw' );
                        if( $cache->isFileCacheGood( /* Assume up to date */ ) ) {
                                $cache->loadFromFileCache();
@@ -164,7 +150,7 @@ class RawPage {
                $text = $this->getRawText();
 
                if( !wfRunHooks( 'RawPageViewBeforeOutput', array( &$this, &$text ) ) ) {
-                       wfDebug( __METHOD__ . ': RawPageViewBeforeOutput hook broke raw page output.' );
+                       wfDebug( __METHOD__ . ": RawPageViewBeforeOutput hook broke raw page output.\n" );
                }
 
                echo $text;