These methods take an Ansel_Style object now

diff --git a/ansel/lib/Api.php b/ansel/lib/Api.php
index 164e9c9..d499d37 100644 (file)
--- a/ansel/lib/Api.php
+++ b/ansel/lib/Api.php
@@ -563,7 +563,11 @@ class Ansel_Api extends Horde_Registry_Api
             $gallery = $GLOBALS['injector']->getInstance('Ansel_Storage')->getGallery($gallery_id);
         }
 
-        return $gallery->getKeyImage(empty($params['style']) ? 'ansel_default' : $params['style']);
+        $style = empty($params['style']) ?
+            Ansel::getStyleDefinition('ansel_default') :
+            Ansel::getStyleDefinition($params['style']);
+        
+        return $gallery->getKeyImage($style);
     }
 
     /**
@@ -586,10 +590,14 @@ class Ansel_Api extends Horde_Registry_Api
             $GLOBALS['injector']->getInstance('Ansel_Config')->set('scope', $params['scope']);
         }
 
+        $style = empty($params['style']) ?
+            Ansel::getStyleDefinition('ansel_default') :
+            Ansel::getStyleDefinition($params['style']);
+
         return (string)Ansel::getImageUrl($image_id,
                                           empty($params['view']) ? 'screen': $params['view'],
                                           empty($params['full']) ? false : $params['full'],
-                                          empty($params['style']) ? 'ansel_default' : $params['style']);
+                                          $style);
     }
 
     /**

diff --git a/ansel/lib/Gallery.php b/ansel/lib/Gallery.php
index 36d21c9..14ff39c 100644 (file)
--- a/ansel/lib/Gallery.php
+++ b/ansel/lib/Gallery.php
@@ -599,7 +599,7 @@ class Ansel_Gallery extends Horde_Share_Object_Sql_Hierarchical implements Seria
      *
      * @return mixed  The image_id of the key image or false.
      */
-    public function getKeyImage($style = null)
+    public function getKeyImage(Ansel_Style $style = null)
     {
         if (is_null($style)) {
             $style = $this->getStyle();