From: Andreas Unterkircher <unki@netshadow.at>
Date: Sun, 30 Dec 2007 11:19:22 +0000 (+0100)
Subject: Merge branch 'master' of /var/cache/git/phpfspot
X-Git-Tag: phpfspot-1.2~13^2
X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=42421caef780487aeaa633f62ae08ec397865b68

Merge branch 'master' of /var/cache/git/phpfspot
---

42421caef780487aeaa633f62ae08ec397865b68
diff --cc phpfspot.class.php
index 841da50,ea91b01..5e64117
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@@ -1267,10 -1288,8 +1288,10 @@@ class PHPFSPOT 
  
        $file_md5 = md5_file($full_path);
  
-       $this->_debug("Image [". $idx ."] ". $this->shrink_text($details['name'], 20) ." Thumbnails:");
+       $this->_debug("Image [". $idx ."] ". $this->shrink_text($this->parse_uri($details['uri'], 'filename'), 20) ." Thumbnails:");
  
 +      $changes = false;
 +
        foreach($resolutions as $resolution) {
  
           $thumb_sub_path = substr($file_md5, 0, 2);