summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/photos.php
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2010-08-30 22:06:26 -0700
committerTim Almdal <tnalmdal@shaw.ca>2010-08-30 22:06:26 -0700
commit866f8eefc66f24f9fcfb9f20bdc0add3a654db76 (patch)
tree11f39ff6251b1c90cc3f03a37fd9ec67243db991 /modules/gallery/controllers/photos.php
parent0f2daf29acc051e7fe79abc625406684e9da8196 (diff)
parentd5ebcb91ad8401df8a393f84ade82150467dbf33 (diff)
Fix for ticket #1320. Hook the loading of the initial albums and check to see if the loaded item is the requested item.
Diffstat (limited to 'modules/gallery/controllers/photos.php')
-rw-r--r--modules/gallery/controllers/photos.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php
index 8377e6c7..b22ac8e5 100644
--- a/modules/gallery/controllers/photos.php
+++ b/modules/gallery/controllers/photos.php
@@ -41,7 +41,7 @@ class Photos_Controller extends Items_Controller {
$template->set_global("item", $photo);
$template->set_global("children", array());
$template->set_global("children_count", 0);
- $template->set_global("parents", $photo->parents());
+ $template->set_global("parents", $photo->parents()->as_array());
$template->set_global("next_item", $next_item);
$template->set_global("previous_item", $previous_item);
$template->set_global("sibling_count", $photo->parent()->viewable()->children_count($where));