diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-22 05:35:21 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-09-22 05:35:21 -0700 |
| commit | 05275e2c07549ae9c40e647154fa442d796918b8 (patch) | |
| tree | cf287cfb40ce35b9dc7cb8de2d073be0ed788f94 /modules/gallery/controllers/albums.php | |
| parent | dd31b1d39f9a342afc82cc7e446e36454a882cf9 (diff) | |
| parent | 22296907b77a00aa28e174b6e0231faed7c10fcd (diff) | |
Merge branch 'master' into talmdal_dev
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) { |