From f9e54577af112ef3314bef0431c0ab543424e6a8 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Thu, 28 Mar 2013 09:54:50 -0400
Subject: [PATCH] Remove completely unused $wgRedirectScript/redirect.php

Change-Id: Ia624d65fbb1c787293054e12162b1444ab7c1edc
---
 RELEASE-NOTES-1.22           |  3 ++-
 includes/DefaultSettings.php |  8 --------
 includes/Setup.php           |  1 -
 redirect.php                 | 36 ------------------------------------
 redirect.php5                | 24 ------------------------
 redirect.phtml               |  3 ---
 6 files changed, 2 insertions(+), 73 deletions(-)
 delete mode 100644 redirect.php
 delete mode 100644 redirect.php5
 delete mode 100644 redirect.phtml

diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index fd6c5c9cc7..beecf18414 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -9,6 +9,7 @@ MediaWiki 1.22 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.22 ===
+* $wgRedirectScript was removed. It was unused.
 
 === New features in 1.22 ===
 
@@ -23,7 +24,7 @@ regularly. Below only new and removed languages are listed, as well as
 changes to languages because of Bugzilla reports.
 
 === Other changes in 1.22 ===
-
+* redirect.php was removed. It was unused.
 
 == Compatibility ==
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index de874a6e1d..8a5a222de6 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -171,14 +171,6 @@ $wgScriptExtension = '.php';
  */
 $wgScript = false;
 
-/**
- * The URL path to redirect.php. This is a script that is used by the Nostalgia
- * skin.
- *
- * Defaults to "{$wgScriptPath}/redirect{$wgScriptExtension}".
- */
-$wgRedirectScript = false;
-
 /**
  * The URL path to load.php.
  *
diff --git a/includes/Setup.php b/includes/Setup.php
index a602b79423..08ab14373e 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -45,7 +45,6 @@ if ( !isset( $wgVersion ) ) {
 
 // Set various default paths sensibly...
 if ( $wgScript === false ) $wgScript = "$wgScriptPath/index$wgScriptExtension";
-if ( $wgRedirectScript === false ) $wgRedirectScript = "$wgScriptPath/redirect$wgScriptExtension";
 if ( $wgLoadScript === false ) $wgLoadScript = "$wgScriptPath/load$wgScriptExtension";
 
 if ( $wgArticlePath === false ) {
diff --git a/redirect.php b/redirect.php
deleted file mode 100644
index 5e6cfeed68..0000000000
--- a/redirect.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * Script that redirects to the article passed in the "wpDropdown" parameter.
- * This is used by the nostalgia skin for the special pages drop-down
- *
- * 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
- */
-
-if ( isset( $_SERVER['MW_COMPILED'] ) ) {
-	require ( 'phase3/includes/WebStart.php' );
-} else {
-	require ( __DIR__ . '/includes/WebStart.php' );
-}
-
-global $wgArticlePath;
-
-$page = $wgRequest->getVal( 'wpDropdown' );
-
-$url = str_replace( "$1", urlencode( $page ), $wgArticlePath );
-
-header( "Location: {$url}", true, 301 );
diff --git a/redirect.php5 b/redirect.php5
deleted file mode 100644
index b65f69aab4..0000000000
--- a/redirect.php5
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Version of redirect.php to used in web server requiring .php5 extension
- * to execute scripts with PHP5 engine.
- *
- * 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
- */
-
-require './redirect.php';
diff --git a/redirect.phtml b/redirect.phtml
deleted file mode 100644
index 3e430bffc4..0000000000
--- a/redirect.phtml
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-// stub file for compatibility with older versions
-include_once('./redirect.php');
-- 
2.20.1