Merge "Revert "Limit searches at 500 per page""

[lhc/web/wiklou.git] / includes / actions / RawAction.php

diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index a0116fb..b753407 100644 (file)
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -77,7 +77,8 @@ class RawAction extends FormlessAction {
 
                $contentType = $this->getContentType();
 
-               # Force caching for CSS and JS raw content, default: 5 minutes
+               # Force caching for CSS and JS raw content, default: 5 minutes.
+               # Note: If using a canonical url for userpage css/js, we send an HTCP purge.
                if ( $smaxage === null ) {
                        if ( $contentType == 'text/css' || $contentType == 'text/javascript' ) {
                                $smaxage = intval( $wgForcedRawSMaxage );
@@ -164,7 +165,7 @@ class RawAction extends FormlessAction {
                                } elseif ( !$content instanceof TextContent ) {
                                        // non-text content
                                        wfHttpError( 415, "Unsupported Media Type", "The requested page uses the content model `"
-                                                                               . $content->getModel() . "` which is not supported via this interface." );
+                                               . $content->getModel() . "` which is not supported via this interface." );
                                        die();
                                } else {
                                        // want a section?