diff options
| author | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-01 17:40:01 +0000 |
|---|---|---|
| committer | Nathan Kinkade <nkinkade@nkinka.de> | 2010-09-01 17:40:01 +0000 |
| commit | 538df03dd14f93419209ef61107a674575828e25 (patch) | |
| tree | f5874b59fa616d538abaf08f9c9bf61724788bba /modules/gallery/controllers/photos.php | |
| parent | 940f9330efca76c84e7a645cafc93acd2751a225 (diff) | |
| parent | 78c590ebaee738435260e3b0bf6cb8fb5431a08d (diff) | |
Manually merged changes to .htaccess file resolving conflicts due to my changes of the file.
Diffstat (limited to 'modules/gallery/controllers/photos.php')
| -rw-r--r-- | modules/gallery/controllers/photos.php | 2 |
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)); |