Manually fixed a merge conflict after pulling.

1 files changed, 18 insertions, 0 deletions

diff --git a/modules/gallery/helpers/item.php b/modules/gallery/helpers/item.php
index 7e779544..0bb45e49 100644
--- a/modules/gallery/helpers/item.php
+++ b/modules/gallery/helpers/item.php
@@ -402,4 +402,22 @@ class item_Core {
 
     return $position;
   }
+
+  /**
+   * Set the display context callback for any future item renders.
+   */
+  static function set_display_context_callback() {
+    $args = func_get_args();
+    Cache::instance()->set("display_context_" . $sid = Session::instance()->id(), $args);
+  }
+
+  /**
+   * Call the display context callback for the given item
+   */
+  static function get_display_context($item) {
+    $args = Cache::instance()->get("display_context_" . $sid = Session::instance()->id());
+    $callback = $args[0];
+    $args[0] = $item;
+    return call_user_func_array($callback, $args);
+  }
 }
\ No newline at end of file