Brion VIBBER has submitted this change and it was merged. Change subject: Remove completely unused $wgRedirectScript/redirect.php ......................................................................
Remove completely unused $wgRedirectScript/redirect.php Change-Id: Ia624d65fbb1c787293054e12162b1444ab7c1edc --- M RELEASE-NOTES-1.22 M includes/DefaultSettings.php M includes/Setup.php D redirect.php D redirect.php5 D redirect.phtml 6 files changed, 2 insertions(+), 73 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22 index fd6c5c9..beecf18 100644 --- a/RELEASE-NOTES-1.22 +++ b/RELEASE-NOTES-1.22 @@ -9,6 +9,7 @@ production. === Configuration changes in 1.22 === +* $wgRedirectScript was removed. It was unused. === New features in 1.22 === @@ -23,7 +24,7 @@ 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 de874a6..8a5a222 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -172,14 +172,6 @@ $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. * * Defaults to "{$wgScriptPath}/load{$wgScriptExtension}". diff --git a/includes/Setup.php b/includes/Setup.php index a602b79..08ab143 100644 --- a/includes/Setup.php +++ b/includes/Setup.php @@ -45,7 +45,6 @@ // 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 5e6cfee..0000000 --- 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 b65f69a..0000000 --- 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 3e430bf..0000000 --- a/redirect.phtml +++ /dev/null @@ -1,3 +0,0 @@ -<?php -// stub file for compatibility with older versions -include_once('./redirect.php'); -- To view, visit https://gerrit.wikimedia.org/r/56394 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ia624d65fbb1c787293054e12162b1444ab7c1edc Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Demon <ch...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Hoo man <h...@online.de> Gerrit-Reviewer: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits