From 9b9f1a7b07daecf2251770e4f49838f22cb58a2a Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Sat, 2 Mar 2013 13:25:10 +0100
Subject: #2031 - Add class_exists() before method_exists() if class existence
 is unknown. - fixed all instances of this in core code - deleted previous
 Zend Guard Loader workaround in MY_Kohana.php - updated Bootstrap.php to
 reflect deleted MY_Kohana.php

---
 modules/gallery/libraries/Theme_View.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 986fc8a2..0a4c96e1 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -239,7 +239,7 @@ class Theme_View_Core extends Gallery_View {
           continue;
         }
         $helper_class = "{$module->name}_theme";
-        if (method_exists($helper_class, $function)) {
+        if (class_exists($helper_class) && method_exists($helper_class, $function)) {
           $blocks[] = call_user_func_array(
             array($helper_class, $function),
             array_merge(array($this), $args));
@@ -247,7 +247,7 @@ class Theme_View_Core extends Gallery_View {
       }
 
       $helper_class = theme::$site_theme_name . "_theme";
-      if (method_exists($helper_class, $function)) {
+      if (class_exists($helper_class) && method_exists($helper_class, $function)) {
         $blocks[] = call_user_func_array(
           array($helper_class, $function),
           array_merge(array($this), $args));
-- 
cgit v1.2.3


From bae14a76e52524e2157948bf30cfe3340d1e9a94 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 14:42:43 +0100
Subject: Themes can set minimum thumbnail size when calculating proportions.

This prevents broken item rendering when thumbnails are smaller than the
theme design allows.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 5 +++--
 themes/wind/views/page.html.php          | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 0a4c96e1..16c57794 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -60,9 +60,10 @@ 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
+   * @param int               (optional) minimum thumbnail width
    * @return int
    */
-  public function thumb_proportion($item=null) {
+  public function thumb_proportion($item=null, $minimum_size=0) {
     // If the item is an album with children, grab the first item in that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
@@ -74,7 +75,7 @@ class Theme_View_Core extends Gallery_View {
     // proportion based on the global thumbnail size, but since modules can override that, we
     // return the actual proportions when we have them.
     if ($item && $item->has_thumb()) {
-      return max($item->thumb_width, $item->thumb_height) / 200;
+      return max($item->thumb_width, $item->thumb_height, $minimum_size) / 200;
     } else {
       // @TODO change the 200 to a theme supplied value when and if we come up with an
       // API to allow the theme to set defaults.
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1bb329df..1dbb31c0 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed"
           href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
-    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item())) != 1): ?>
+    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100)) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
-- 
cgit v1.2.3


From 3c47deb9ef3fd35b1602c822af2b752c6733bed3 Mon Sep 17 00:00:00 2001
From: Jozef Selesi <jozef.selesi@saturized.com>
Date: Mon, 11 Mar 2013 15:59:00 +0100
Subject: Themes can choose child thumbnail when asking for proportion.

This helps themes better calculate an item's container size, for cases
when the first item significantly differs in size from the rest.

Trac-Ticket: #1838
---
 modules/gallery/libraries/Theme_View.php | 21 +++++++++++++++++----
 themes/wind/views/page.html.php          |  2 +-
 2 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 16c57794..da1e8ce8 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -58,17 +58,30 @@ class Theme_View_Core extends Gallery_View {
   }
 
   /**
-   * Proportion of the current thumb_size's to default
+   * Proportion of the current thumb_size's to default.
+   *
+   * Themes can optionally use the $dimension parameter to choose which of the album's
+   * children will be used to determine the proportion.  If set, the proportion will be
+   * calculated based on the child item with the largest width or height.
+   *
    * @param object Item_Model (optional) check the proportions for this item
    * @param int               (optional) minimum thumbnail width
+   * @param string            (optional) "width" or "height"
    * @return int
    */
-  public function thumb_proportion($item=null, $minimum_size=0) {
-    // If the item is an album with children, grab the first item in that album instead.  We're
+  public function thumb_proportion($item=null, $minimum_size=0, $dimension=null) {
+    if (!in_array($dimension, array("height", "width"))) {
+      $dimension = null;
+    }
+
+    // If the item is an album with children, grab an item from that album instead.  We're
     // interested in the size of the thumbnails in this album, not the thumbnail of the
     // album itself.
     if ($item && $item->is_album() && $item->children_count()) {
-      $item = $item->children(1)->current();
+      $orderBy = (is_null($dimension)) ? array()
+                                       : array("thumb_".$dimension => "desc");
+
+      $item = $item->children(1, null, array(), $orderBy)->current();
     }
 
     // By default we have a globally fixed thumbnail size In core code, we just return a fixed
diff --git a/themes/wind/views/page.html.php b/themes/wind/views/page.html.php
index 1dbb31c0..0ae41ea7 100644
--- a/themes/wind/views/page.html.php
+++ b/themes/wind/views/page.html.php
@@ -24,7 +24,7 @@
     <link rel="apple-touch-icon-precomposed"
           href="<?= url::file(module::get_var("gallery", "apple_touch_icon_url")) ?>" />
     <? if ($theme->page_type == "collection"): ?>
-    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100)) != 1): ?>
+    <? if (($thumb_proportion = $theme->thumb_proportion($theme->item(), 100, "width")) != 1): ?>
         <? $new_width = round($thumb_proportion * 213) ?>
         <? $new_height = round($thumb_proportion * 240) ?>
         <style type="text/css">
-- 
cgit v1.2.3


From b6dc597c6613df10f1b833f8bd1ea85602afceed Mon Sep 17 00:00:00 2001
From: shadlaws <shad@shadlaws.com>
Date: Mon, 11 Mar 2013 23:10:27 +0100
Subject: Fix Theme_View::siblings bug - limit and offset reversed in
 sibling_callback. I wonder if this could be causing some random issues I see
 on the forums...

---
 modules/gallery/libraries/Theme_View.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/gallery/libraries/Theme_View.php')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 0a4c96e1..91183753 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -89,7 +89,7 @@ class Theme_View_Core extends Gallery_View {
   public function siblings($limit=null, $offset=null) {
     return call_user_func_array(
       $this->siblings_callback[0],
-      array_merge($this->siblings_callback[1], array($offset, $limit)));
+      array_merge($this->siblings_callback[1], array($limit, $offset)));
   }
 
   public function tag() {
-- 
cgit v1.2.3