From: Reedy <reedy@wikimedia.org>
Date: Thu, 28 Feb 2013 01:45:54 +0000 (+0000)
Subject: Kill off and remove HttpRequest class
X-Git-Tag: 1.31.0-rc.0~20522^2
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=6f3e4e98064a9e02a0e71b48c852a0a0b1a2ed43;p=lhc%2Fweb%2Fwiklou.git

Kill off and remove HttpRequest class

Change-Id: I0661d483c60fc0d32f0c51937e91bece6960dfcf
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 5bbfd96e28..d6aae1dddc 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -136,7 +136,6 @@ $wgAutoloadLocalClasses = array(
 	'HTMLTextField' => 'includes/HTMLForm.php',
 	'Http' => 'includes/HttpFunctions.php',
 	'HttpError' => 'includes/Exception.php',
-	'HttpRequest' => 'includes/HttpFunctions.old.php',
 	'ICacheHelper' => 'includes/CacheHelper.php',
 	'IcuCollation' => 'includes/Collation.php',
 	'IdentityCollation' => 'includes/Collation.php',
diff --git a/includes/HttpFunctions.old.php b/includes/HttpFunctions.old.php
deleted file mode 100644
index feb9b93c37..0000000000
--- a/includes/HttpFunctions.old.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Class alias kept for backward compatibility.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup HTTP
- */
-
-/**
- * HttpRequest was renamed to MWHttpRequest in order
- * to prevent conflicts with PHP's HTTP extension
- * which also defines an HttpRequest class.
- * http://www.php.net/manual/en/class.httprequest.php
- *
- * This is for backwards compatibility.
- * @since 1.17
- */
-class HttpRequest extends MWHttpRequest { }