From a5163810e76ae6051b6f9497d6799ded43a781ec Mon Sep 17 00:00:00 2001 From: "Michael J. Rubinsky" Date: Sun, 9 Jan 2011 19:30:00 -0500 Subject: [PATCH] These methods take an Ansel_Style object now --- ansel/lib/Api.php | 12 ++++++++++-- ansel/lib/Gallery.php | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ansel/lib/Api.php b/ansel/lib/Api.php index 164e9c903..d499d37a8 100644 --- 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 36d21c90d..14ff39c7e 100644 --- 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(); -- 2.11.0