Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FU r103738: redid the method of getting the source file name for thumbnails altogether, using suggestion per CR.

Browse source
This commit is contained in:
Aaron Schulz 2011-11-25 02:21:46 +00:00
parent cce8c92045
commit 22c5655da3
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
img_auth.php
View file

@ -94,12 +94,13 @@ function wfImageAuthMain() {
return;
}
// Extract the file name and chop off the size specifier
// Extract the file name and chop off the size specifier.
// (e.g. 120px-Foo.png => Foo.png or page2-120px-Foo.png => Foo.png).
// This only applies to thumbnails, and all thumbnails have a -px specifier.
// This only applies to thumbnails, and all thumbnails should
// be under a folder that has the source file name.
$name = wfBaseName( $path );
if ( preg_match( '!(?:[^-]*-)*?\d+px-(.*)!i', $name, $m ) ) {
$name = $m[1]; // this file is a thumbnail
if ( strpos( $path, '/thumb/' ) === 0 ) {
$name = wfBaseName( dirname( $path ) ); // this file is a thumbnail
}
$title = Title::makeTitleSafe( NS_FILE, $name );
@ -116,7 +117,7 @@ function wfImageAuthMain() {
// Check user authorization for this title
// UserCanRead Checks Whitelist too
if( !$title->userCanRead() ) {
if ( !$title->userCanRead() ) {
wfForbidden( 'img-auth-accessdenied', 'img-auth-noread', $name );
return;
}