From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 31 Dec 2010 14:49:15 +0000 (-0500)
Subject: fix calculating vfs paths when using vfs direct
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=61c6b2e70d1c9fb9d6bade0d073bf94348a3f4af;p=horde.git

fix calculating vfs paths when using vfs direct
---

diff --git a/ansel/lib/Image.php b/ansel/lib/Image.php
index d10d673b0..f012ef24f 100644
--- a/ansel/lib/Image.php
+++ b/ansel/lib/Image.php
@@ -345,7 +345,7 @@ class Ansel_Image Implements Iterator
         }
 
         /* Get the VFS path. */
-        $view = Ansel::getViewHash($view, $style);
+        $view = $style->getHash($view);
 
         /* Can't call the various vfs methods here, since this method needs
         to be called statically */
diff --git a/ansel/lib/Style.php b/ansel/lib/Style.php
index 86656d0fe..1b12fad42 100644
--- a/ansel/lib/Style.php
+++ b/ansel/lib/Style.php
@@ -57,9 +57,7 @@ class Ansel_Style
 
     public function getHash($view)
     {
-        if ($view != 'screen' && $view != 'thumb' && $view != 'mini' &&
-            $view != 'full') {
-
+        if ($view != 'screen' && $view != 'mini' && $view != 'full') {
             $view = md5($this->thumbstyle . '.' . $this->background);
         }