diff options
Diffstat (limited to 'modules/gallery/controllers/photos.php')
| -rw-r--r-- | modules/gallery/controllers/photos.php | 26 | 
1 files changed, 5 insertions, 21 deletions
| diff --git a/modules/gallery/controllers/photos.php b/modules/gallery/controllers/photos.php index 054300a1..c052f827 100644 --- a/modules/gallery/controllers/photos.php +++ b/modules/gallery/controllers/photos.php @@ -1,7 +1,7 @@  <?php defined("SYSPATH") or die("No direct script access.");  /**   * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2011 Bharat Mediratta + * Copyright (C) 2000-2012 Bharat Mediratta   *   * This program is free software; you can redistribute it and/or modify   * it under the terms of the GNU General Public License as published by @@ -27,27 +27,11 @@ class Photos_Controller extends Items_Controller {      access::required("view", $photo); -    $where = array(array("type", "!=", "album")); -    $position = item::get_position($photo, $where); -    if ($position > 1) { -      list ($previous_item, $ignore, $next_item) = -        $photo->parent()->viewable()->children(3, $position - 2, $where); -    } else { -      $previous_item = null; -      list ($next_item) = $photo->parent()->viewable()->children(1, $position, $where); -    } -      $template = new Theme_View("page.html", "item", "photo"); -    $template->set_global( -      array("item" => $photo, -            "children" => array(), -            "children_count" => 0, -            "parents" => $photo->parents()->as_array(), -            "next_item" => $next_item, -            "previous_item" => $previous_item, -            "sibling_count" => $photo->parent()->viewable()->children_count($where), -            "position" => $position)); - +    $template->set_global(array("item" => $photo, +                                "children" => array(), +                                "children_count" => 0)); +    $template->set_global(item::get_display_context($photo));      $template->content = new View("photo.html");      $photo->increment_view_count(); | 
