From 1ed54ab5dc6e09044d9757eb31f1e0d58e3d9fb1 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Tue, 30 Aug 2011 20:49:23 -0700 Subject: Make the Theme_View::thumb_proportion() API call backwards compatible to the API before dc21cf36b606048dc24532407d39bc8f5b4211fa. Fixes #1775 --- modules/gallery/libraries/Theme_View.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'modules/gallery/libraries') diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index 13e58004..389eace6 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -54,13 +54,14 @@ class Theme_View_Core extends Gallery_View { /** * Proportion of the current thumb_size's to default + * @param object Item_Model (optional) check the proportions for this item * @return int */ - public function thumb_proportion($item) { + public function thumb_proportion($item=null) { // By default we have a globally fixed thumbnail size In core code, we just return a fixed // proportion based on the global thumbnail size, but since modules can override that, we // return the actual proportions when we have them. - if ($item->has_thumb()) { + if ($item && $item->has_thumb()) { return max($item->thumb_width, $item->thumb_height) / 200; } else { // @TODO change the 200 to a theme supplied value when and if we come up with an -- cgit v1.2.3