Fix bug with md5 generation of archived images

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index c478895..b9e9e2b 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -132,7 +132,7 @@ function wfThumbUrl( $img )
 }
 
 
-function wfImageArchiveUrl( $name, $subdir="archive" )
+function wfImageThumbUrl( $name, $subdir="thumb" )
 {
        global $wgUploadPath;
 
@@ -142,6 +142,16 @@ function wfImageArchiveUrl( $name, $subdir="archive" )
        return wfUrlencode($url);
 }
 
+function wfImageArchiveUrl( $name )
+{
+       global $wgUploadPath;
+
+       $hash = md5( substr( $name, 15) );
+       $url = "{$wgUploadPath}/archive/" . $hash{0} . "/" .
+         substr( $hash, 0, 2 ) . "/{$name}";
+       return wfUrlencode($url);
+}
+
 function wfUrlencode ( $s )
 {
        $ulink = urlencode( $s );
@@ -462,6 +472,11 @@ function wfImageDir( $fname )
        return $dest;
 }
 
+function wfImageThumbDir( $fname , $subdir="thumb")
+{
+       return wfImageArchiveDir( $fname, $subdir );
+}
+
 function wfImageArchiveDir( $fname , $subdir="archive")
 {
        global $wgUploadDirectory;

diff --git a/includes/Skin.php b/includes/Skin.php
index 3ef1ca6..598181e 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1519,8 +1519,8 @@ class Skin {
                global $wgUseImageMagick;
                $imgPath   = wfImagePath( $name );
                $thumbName = $width."px-".$icon.$name;
-               $thumbPath = wfImageArchiveDir( $thumbName, "thumb" )."/".$thumbName;
-               $thumbUrl  = wfImageArchiveUrl( $thumbName, "thumb" );
+               $thumbPath = wfImageThumbDir( $thumbName )."/".$thumbName;
+               $thumbUrl  = wfImageThumbUrl( $thumbName );
 
                if (     (! file_exists( $thumbPath ) && file_exists( $imgPath )) 
                     ||  ( filemtime($thumbPath) < filemtime($imgPath) ) ) {