diff options
| -rw-r--r-- | .build_number | 2 | ||||
| -rw-r--r-- | lib/gallery.common.js | 1 | ||||
| -rw-r--r-- | modules/gallery/helpers/item.php | 3 | ||||
| -rw-r--r-- | modules/organize/views/organize_frame.html.php | 12 |
4 files changed, 12 insertions, 6 deletions
diff --git a/.build_number b/.build_number index d41d4003..420d11e7 100644 --- a/.build_number +++ b/.build_number @@ -3,4 +3,4 @@ ; process. You don't need to edit it. In fact.. ; ; DO NOT EDIT THIS FILE BY HAND! -build_number=183 +build_number=185 diff --git a/lib/gallery.common.js b/lib/gallery.common.js index 697a33cb..b499a2cd 100644 --- a/lib/gallery.common.js +++ b/lib/gallery.common.js @@ -33,6 +33,7 @@ var elh = $(el).height(); var ph = $(this).height(); var nh = (ph - elh) / 2; + if (nh < 1) { var nh = 0; } $(el).css('margin-top', nh); }); }; diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php index 0bb45e49..a0654a88 100644 --- a/modules/gallery/helpers/item.php +++ b/modules/gallery/helpers/item.php @@ -418,6 +418,9 @@ class item_Core { $args = Cache::instance()->get("display_context_" . $sid = Session::instance()->id()); $callback = $args[0]; $args[0] = $item; + if (!$callback) { + $callback = "Albums_Controller::get_display_context"; + } return call_user_func_array($callback, $args); } }
\ No newline at end of file diff --git a/modules/organize/views/organize_frame.html.php b/modules/organize/views/organize_frame.html.php index 47828944..20a1a6da 100644 --- a/modules/organize/views/organize_frame.html.php +++ b/modules/organize/views/organize_frame.html.php @@ -129,12 +129,14 @@ var get_id_from_node = function(node) { var id = node.getAttribute("rel"); - if (!id) { - // IE9 has a bug which causes it to be unable to read the "rel" attr - // so hack it by extracting the id the CSS class id. This is fragile. - // ref: https://sourceforge.net/apps/trac/gallery/ticket/1790 - return node.getAttribute("id").replace("thumb-", ""); + if (id) { + return id; } + + // IE9 has a bug which causes it to be unable to read the "rel" attr + // so hack it by extracting the id the CSS class id. This is fragile. + // ref: https://sourceforge.net/apps/trac/gallery/ticket/1790 + return node.getAttribute("id").replace("thumb-", ""); } /* |