new method was added in the same rel, so wait before showing the notice. follow up...

[lhc/web/wiklou.git] / img_auth.php

diff --git a/img_auth.php b/img_auth.php
index fc431f8..968a60e 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -94,12 +94,12 @@ 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 should have
-       // a width indicator and be under a folder that has the source file name.
+       // 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 ) ) {
+       if ( strpos( $path, '/thumb/' ) === 0 ) {
                $name = wfBaseName( dirname( $path ) ); // this file is a thumbnail
        }
 
@@ -116,8 +116,8 @@ function wfImageAuthMain() {
        }
        
        // Check user authorization for this title
-       // UserCanRead Checks Whitelist too
-       if ( !$title->userCanRead() ) {
+       // Checks Whitelist too
+       if ( !$title->userCan( 'read' ) ) {
                wfForbidden( 'img-auth-accessdenied', 'img-auth-noread', $name );
                return;
        }