Revert r45160 "(bug 11330) Passing default to Request->getInt() is good enough, rathe...

This rev changes the behavior, forcing $smaxage to $wgSquidMaxage in cases where we would have previously ended up with $wgForcedRawSMaxage or 0.

diff --git a/includes/RawPage.php b/includes/RawPage.php
index 6b41e85..5d5c081 100644 (file)
--- a/includes/RawPage.php
+++ b/includes/RawPage.php
@@ -34,7 +34,7 @@ class RawPage {
                }
 
                $ctype = $this->mRequest->getVal( 'ctype' );
-               $smaxage = $this->mRequest->getInt( 'smaxage', $wgSquidMaxage );
+               $smaxage = $this->mRequest->getIntOrNull( 'smaxage', $wgSquidMaxage );
                $maxage = $this->mRequest->getInt( 'maxage', $wgSquidMaxage );
 
                $this->mExpandTemplates = $this->mRequest->getVal( 'templates' ) === 'expand';
@@ -73,9 +73,11 @@ class RawPage {
 
                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;