DB name can have hyphens (fixed in r79767), bug 26685 pointed out the message discrepancy

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

diff --git a/img_auth.php b/img_auth.php
index e8ad6b9..c2541f6 100644 (file)
--- a/img_auth.php
+++ b/img_auth.php
@@ -39,13 +39,16 @@ if ( $wgImgAuthPublicTest
 
 // Extract path and image information
 if( !isset( $_SERVER['PATH_INFO'] ) ) {
-        if( isset( $_GET['path'] ) ) $path = $_GET['path'];
-        else wfForbidden('img-auth-accessdenied','img-auth-nopathinfo');
+       $path = $wgRequest->getText( 'path' );
+       if( !$path ) {
+        wfForbidden( 'img-auth-accessdenied', 'img-auth-nopathinfo' );
+       }
+       $path = "/$path";
 } else {
-        $path = $_SERVER['PATH_INFO'];
+       $path = $_SERVER['PATH_INFO'];
 }
 
-$filename = realpath( $wgUploadDirectory . '/' . $path );
+$filename = realpath( $wgUploadDirectory . $path );
 $realUpload = realpath( $wgUploadDirectory );
 
 // Basic directory traversal check