From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 29 Dec 2008 18:58:27 +0000 (+0000)
Subject: (bug 11330) Passing default to Request->getInt() is good enough, rather than added... 
X-Git-Tag: 1.31.0-rc.0~43710
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=147e58f80485e25b15747d54719b8c54f6ea2381;p=lhc%2Fweb%2Fwiklou.git

(bug 11330) Passing default to Request->getInt() is good enough, rather than added code to do the same thing
---

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