diff options
| author | Chad Kieffer <ckieffer@bernie.local> | 2009-09-21 23:08:57 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@bernie.local> | 2009-09-21 23:08:57 -0600 |
| commit | 95945ca18bde4b4ca096d660581fd60d7f06bff5 (patch) | |
| tree | e8693bd26a37dbfc2abdc2aec7617c09180eb4af /modules/gallery/controllers/albums.php | |
| parent | 68f3dab7f202fbd9b690f4db27cc4f4038e58d2f (diff) | |
| parent | e5a78d39ec49332054cbc1a398d7c110e1d9191c (diff) | |
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/albums.php')
| -rw-r--r-- | modules/gallery/controllers/albums.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/gallery/controllers/albums.php b/modules/gallery/controllers/albums.php index 08a60132..3ea08538 100644 --- a/modules/gallery/controllers/albums.php +++ b/modules/gallery/controllers/albums.php @@ -39,7 +39,8 @@ class Albums_Controller extends Items_Controller { $show = $this->input->get("show"); if ($show) { - $index = $album->get_position($show); + $child = ORM::factory("item", $show); + $index = $album->get_position($child); if ($index) { $page = ceil($index / $page_size); if ($page == 1) { |