From: Tim Starling <tstarling@users.mediawiki.org>
Date: Thu, 20 Jan 2011 06:42:45 +0000 (+0000)
Subject: Revert r70418, r70959: direct use of $_GET is not needed anymore since we no longer... 
X-Git-Tag: 1.31.0-rc.0~32461
X-Git-Url: http://git.cyclocoop.org/%22.%24image2.%22?a=commitdiff_plain;h=3df7537df65e89240106169ff3a3caa8f3e9e9b2;p=lhc%2Fweb%2Fwiklou.git

Revert r70418, r70959: direct use of $_GET is not needed anymore since we no longer use null characters as separators as of r80443.
---

diff --git a/includes/CategoryPage.php b/includes/CategoryPage.php
index 86c2717adf..bbd3c438db 100644
--- a/includes/CategoryPage.php
+++ b/includes/CategoryPage.php
@@ -68,18 +68,15 @@ class CategoryPage extends Article {
 	}
 
 	function closeShowCategory() {
-		global $wgOut;
+		global $wgOut, $wgRequest;
 
 		$from = $until = array();
 		foreach ( array( 'page', 'subcat', 'file' ) as $type ) {
-			# Use $_GET instead of $wgRequest, because the latter helpfully
-			# normalizes Unicode, which removes nulls.  TODO: do something
-			# smarter than passing nulls in URLs.  :/
-			$from[$type] = isset( $_GET["{$type}from"] ) ? $_GET["{$type}from"] : null;
-			$until[$type] = isset( $_GET["{$type}until"] ) ? $_GET["{$type}until"] : null;
+			$from[$type] = $wgRequest->getVal( "{$type}from" );
+			$until[$type] = $wgRequest->getVal( "{$type}until" );
 		}
 
-		$viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $_GET );
+		$viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() );
 		$wgOut->addHTML( $viewer->getHTML() );
 	}
 }