summaryrefslogtreecommitdiff
path: root/modules/gallery/helpers
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-01-22 17:42:28 +0000
committerNathan Kinkade <nath@nkinka.de>2012-01-22 17:42:28 +0000
commit9340b55ad9eeba3a295cada4731911a570c7c9d5 (patch)
tree3fe1260a8fd0845d264f7a19fe8f5da8072e9cc7 /modules/gallery/helpers
parent0bec03301b38e1ed2d7a73391e065a787e0e3510 (diff)
parent3a3b154b317814dcbd4ea0c1641b64e386cf85a9 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers')
-rw-r--r--modules/gallery/helpers/item.php3
1 files changed, 3 insertions, 0 deletions
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