stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2024-10-29 21:07:18 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed item controllers so that any item position is computed correctly, when some other items belonging to the same parent album are not viewable.

Browse Source 
Changed depracated calls to item_Model::get_position() to item::get_position().
This commit is contained in:
Jérémy Subtil 2011-01-09 00:22:46 +01:00
parent 0d7e951aa5
commit 24c0b69847
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gallery/controllers/albums.php
View File

@ -37,7 +37,7 @@ class Albums_Controller extends Items_Controller {
if ($show) {
$child = ORM::factory("item", $show);
$index = $album->get_position($child);
$index = item::get_position($child);
if ($index) {
$page = ceil($index / $page_size);
if ($page == 1) {

4
modules/gallery/controllers/movies.php
View File

@ -28,10 +28,10 @@ class Movies_Controller extends Items_Controller {
access::required("view", $movie);
$where = array(array("type", "!=", "album"));
$position = $movie->parent()->get_position($movie, $where);
$position = item::get_position($movie, $where);
if ($position > 1) {
list ($previous_item, $ignore, $next_item) =
$movie->parent()->children(3, $position - 2, $where);
$movie->parent()->viewable()->children(3, $position - 2, $where);
} else {
$previous_item = null;
list ($next_item) = $movie->parent()->viewable()->children(1, $position, $where);

4
modules/gallery/controllers/photos.php
View File

@ -28,10 +28,10 @@ class Photos_Controller extends Items_Controller {
access::required("view", $photo);
$where = array(array("type", "!=", "album"));
$position = $photo->parent()->get_position($photo, $where);
$position = item::get_position($photo, $where);
if ($position > 1) {
list ($previous_item, $ignore, $next_item) =
$photo->parent()->children(3, $position - 2, $where);
$photo->parent()->viewable()->children(3, $position - 2, $where);
} else {
$previous_item = null;
list ($next_item) = $photo->parent()->viewable()->children(1, $position, $where);