jenkins-bot has submitted this change and it was merged.
Change subject: Reimplement Special:Filepath as a redirect through
Special:Redirect/File.
......................................................................
Reimplement Special:Filepath as a redirect through Special:Redirect/File.
Reduces code duplication (and some ugly deprecated code patterns in the
Special:Filepath implementation). In the long term, reduces the need for
one-off redirection pages (Special:PermanentLink, Special:Filepath, etc)
in favor of an extensible system based around Special:Redirect.
Change-Id: I42d5879342bc18412f0383c538e83c68b1c3cc2a
---
M includes/specials/SpecialFilepath.php
M languages/messages/MessagesEn.php
M maintenance/language/messages.inc
3 files changed, 6 insertions(+), 77 deletions(-)
Approvals:
Parent5446: Looks good to me, but someone else must approve
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialFilepath.php
b/includes/specials/SpecialFilepath.php
index d4b0285..57e552b 100644
--- a/includes/specials/SpecialFilepath.php
+++ b/includes/specials/SpecialFilepath.php
@@ -2,6 +2,7 @@
/**
* Implements Special:Filepath
*
+ * @section LICENSE
* 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
@@ -26,74 +27,15 @@
*
* @ingroup SpecialPage
*/
-class SpecialFilepath extends SpecialPage {
+class SpecialFilepath extends RedirectSpecialPage {
function __construct() {
parent::__construct( 'Filepath' );
+ $this->mAllowedRedirectParams = array( 'width', 'height' );
}
- function execute( $par ) {
- $this->setHeaders();
- $this->outputHeader();
-
- $request = $this->getRequest();
- $file = $par ?: $request->getText( 'file' );
-
- $title = Title::newFromText( $file, NS_FILE );
-
- if ( !( $title instanceof Title ) || $title->getNamespace() !=
NS_FILE ) {
- $this->showForm( $title );
- } else {
- $file = wfFindFile( $title );
-
- if ( $file && $file->exists() ) {
- // Default behavior: Use the direct link to the
file.
- $url = $file->getURL();
- $width = $request->getInt( 'width', -1 );
- $height = $request->getInt( 'height', -1 );
-
- // If a width is requested...
- if ( $width != -1 ) {
- $mto = $file->transform( array( 'width'
=> $width, 'height' => $height ) );
-
- // ... and we can
- if ( $mto && !$mto->isError() ) {
- // ... change the URL to point
to a thumbnail.
- $url = $mto->getURL();
- }
- }
- $this->getOutput()->redirect( $url );
- } else {
- $this->getOutput()->setStatusCode( 404 );
- $this->showForm( $title );
- }
- }
- }
-
- /**
- * @param Title $title Title requested, or null.
- */
- function showForm( $title ) {
- global $wgScript;
-
- $this->getOutput()->addHTML(
- Html::openElement(
- 'form',
- array( 'method' => 'get', 'action' =>
$wgScript, 'id' => 'specialfilepath' )
- ) .
- Html::openElement( 'fieldset' ) .
- Html::element( 'legend', null, $this->msg(
'filepath' )->text() ) .
- Html::hidden( 'title',
$this->getTitle()->getPrefixedText() ) .
- Xml::inputLabel(
- $this->msg( 'filepath-page' )->text(),
- 'file',
- 'file',
- 25,
- is_object( $title ) ? $title->getText()
: ''
- ) . ' ' .
- Xml::submitButton( $this->msg(
'filepath-submit' )->text() ) . "\n" .
- Html::closeElement( 'fieldset' ) .
- Html::closeElement( 'form' )
- );
+ // implement by redirecting through Special:Redirect/file
+ function getRedirect( $par ) {
+ return SpecialPage::getSafeTitleFor( 'Redirect', 'file/' . $par
);
}
protected function getGroupName() {
diff --git a/languages/messages/MessagesEn.php
b/languages/messages/MessagesEn.php
index c41d935..61f9216 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -4788,13 +4788,6 @@
'version-entrypoints-api-php' =>
'[https://www.mediawiki.org/wiki/Manual:api.php api.php]', # do not translate
or duplicate this message to other languages
'version-entrypoints-load-php' =>
'[https://www.mediawiki.org/wiki/Manual:load.php load.php]', # do not translate
or duplicate this message to other languages
-# Special:FilePath
-'filepath' => 'File path',
-'filepath-page' => 'File:',
-'filepath-submit' => 'Go',
-'filepath-summary' => 'This special page returns the complete path for a file.
-Images are shown in full resolution, other file types are started with their
associated program directly.',
-
# Special:Redirect
'redirect' => 'Redirect by file, user, or revision ID',
'redirect-legend' => 'Redirect to a file or page',
diff --git a/maintenance/language/messages.inc
b/maintenance/language/messages.inc
index deb01d5..4c15928 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -3637,12 +3637,6 @@
'version-entrypoints-api-php',
'version-entrypoints-load-php',
),
- 'filepath' => array(
- 'filepath',
- 'filepath-page',
- 'filepath-submit',
- 'filepath-summary',
- ),
'redirect' => array(
'redirect',
'redirect-legend',
--
To view, visit https://gerrit.wikimedia.org/r/61073
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I42d5879342bc18412f0383c538e83c68b1c3cc2a
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Cscott <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
