More documentation tweaks and updates

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

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 79ee383..5804bf9 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -24,7 +24,7 @@ class RawPage {
        var $mContentType, $mExpandTemplates;
 
        function __construct( Article $article, $request = false ) {
-               global $wgRequest, $wgInputEncoding, $wgSquidMaxage, $wgJsMimeType, $wgGroupPermissions;
+               global $wgRequest, $wgSquidMaxage, $wgJsMimeType, $wgGroupPermissions;
 
                $allowedCTypes = array( 'text/x-wiki', $wgJsMimeType, 'text/css', 'application/x-zope-edit' );
                $this->mArticle = $article;
@@ -82,10 +82,14 @@ class RawPage {
                        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->mCharset = 'UTF-8';
 
                # Force caching for CSS and JS raw content, default: 5 minutes
                if( is_null( $smaxage ) && ( $ctype == 'text/css' || $ctype == $wgJsMimeType ) ) {
@@ -128,7 +132,7 @@ class RawPage {
                        #
                        # Just return a 403 Forbidden and get it over with.
                        wfHttpError( 403, 'Forbidden',
-                               'Invalid file extension found in PATH_INFO. ' .
+                               'Invalid file extension found in PATH_INFO or QUERY_STRING. ' .
                                'Raw pages must be accessed through the primary script entry point.' );
                        return;
                }
@@ -170,6 +174,8 @@ class RawPage {
                        $sk->initPage( $wgOut );
                        if( $this->mGen == 'css' ) {
                                return $sk->generateUserStylesheet();
+                       } else if( $this->mGen == 'js' ) {
+                               return $sk->generateUserJs();
                        }
                } else {
                        return $this->getArticleText();
@@ -183,11 +189,9 @@ class RawPage {
                        // If it's a MediaWiki message we can just hit the message cache
                        if( $this->mUseMessageCache && $this->mTitle->getNamespace() == NS_MEDIAWIKI ) {
                                $key = $this->mTitle->getDBkey();
-                               $text = wfMsgForContentNoTrans( $key );
+                               $msg = wfMessage( $key )->inContentLanguage();
                                # If the message doesn't exist, return a blank
-                               if( wfEmptyMsg( $key, $text ) ) {
-                                       $text = '';
-                               }
+                               $text = !$msg->exists() ? '' : $msg->plain();
                                $found = true;
                        } else {
                                // Get it from the DB
@@ -216,23 +220,13 @@ class RawPage {
                        header( 'HTTP/1.0 404 Not Found' );
                }
 
-               // Special-case for empty CSS/JS
-               //
-               // Internet Explorer for Mac handles empty files badly;
-               // particularly so when keep-alive is active. It can lead
-               // to long timeouts as it seems to sit there waiting for
-               // more data that never comes.
-               //
-               // Give it a comment...
-               if( strlen( $text ) == 0 &&
-                       ( $this->mContentType == 'text/css' ||
-                               $this->mContentType == 'text/javascript' ) ) {
-                       return '/* Empty */';
-               }
-
                return $this->parseArticleText( $text );
        }
 
+       /**
+        * @param $text
+        * @return string
+        */
        function parseArticleText( $text ) {
                if( $text === '' ) {
                        return '';