From f66e75dd5a8c7d6a39b26ee75dfd04309d27a90f Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 28 Mar 2018 13:18:14 -0700 Subject: [PATCH] RawAction: Remove unused $gen variable Follows-up 697c423259 (MW 1.27), which removed use of these variables. The '$this->gen' member is never used, and neither is local $gen. Change-Id: I663d343d0255d5e13d7d87b1d4e565a7df667449 --- includes/actions/RawAction.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php index be10ae47d7..625a9bb928 100644 --- a/includes/actions/RawAction.php +++ b/includes/actions/RawAction.php @@ -59,11 +59,6 @@ class RawAction extends FormlessAction { return; // Client cache fresh and headers sent, nothing more to do. } - $gen = $request->getVal( 'gen' ); - if ( $gen == 'css' || $gen == 'js' ) { - $this->gen = true; - } - $contentType = $this->getContentType(); $maxage = $request->getInt( 'maxage', $config->get( 'SquidMaxage' ) ); @@ -175,7 +170,7 @@ class RawAction extends FormlessAction { } } - if ( $text !== false && $text !== '' && $request->getVal( 'templates' ) === 'expand' ) { + if ( $text !== false && $text !== '' && $request->getRawVal( 'templates' ) === 'expand' ) { $text = $wgParser->preprocess( $text, $title, @@ -225,10 +220,14 @@ class RawAction extends FormlessAction { * @return string */ public function getContentType() { - $ctype = $this->getRequest()->getVal( 'ctype' ); + // Use getRawVal instead of getVal because we only + // need to match against known strings, there is no + // storing of localised content or other user input. + $ctype = $this->getRequest()->getRawVal( 'ctype' ); if ( $ctype == '' ) { - $gen = $this->getRequest()->getVal( 'gen' ); + // Legacy compatibilty + $gen = $this->getRequest()->getRawVal( 'gen' ); if ( $gen == 'js' ) { $ctype = 'text/javascript'; } elseif ( $gen == 'css' ) { -- 2.20.1