Provisional revert of r56916 "(bug 20802) Fixed thumb.php redirect handling. Changed...

This appears to make thumb.php more permissive than it's indended and could lead to littering false-positive thumbnails around the server when used to implement 404 handlers as designed.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0d46156..32b0731 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -530,7 +530,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 20702) Parser functions can now be used correctly in
   MediaWiki:Missing-article
 * (bug 14117) "redirected from" is now also shown on foreign file redirects
-* (bug 20802) Fixed thumb.php redirect handling
 * (bug 17747) Only display thumbnail column in file history if the image can
   be rendered.
 * (bug 3421) Live preview no longer breaks user CSS/JS previews

diff --git a/thumb.php b/thumb.php
index 6c8dcbf..b973cc6 100644 (file)
--- a/thumb.php
+++ b/thumb.php
@@ -62,7 +62,7 @@ function wfThumbMain() {
                }
                $img = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $title, $fileName );
        } else {
-               $img = RepoGroup::singleton()->getLocalRepo()->findFile( $fileName );
+               $img = wfLocalFile( $fileName );
        }
 
        if ( !$img ) {