From 29efb6ba9f3e2cf15f29b509f985890c33bc08fa Mon Sep 17 00:00:00 2001
From: Bharat Mediratta <bharat@menalto.com>
Date: Sat, 14 Nov 2009 16:18:49 -0800
Subject: Rename "pager" to "paginator" so that we differentiate page.html.php
 from paginator.html.php

---
 modules/gallery/libraries/Theme_View.php | 16 +++++++++-------
 modules/search/views/search.html.php     |  2 +-
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php
index 5e8bc728..19dc0829 100644
--- a/modules/gallery/libraries/Theme_View.php
+++ b/modules/gallery/libraries/Theme_View.php
@@ -140,26 +140,28 @@ class Theme_View_Core extends Gallery_View {
    *
    * See themes/wind/views/pager.html for documentation on the variables generated here.
    */
-  public function pager() {
-    $v = new View("pager.html");
+  public function paginator() {
+    $v = new View("paginator.html");
     $v->page_type = $this->page_type;
     $v->first_page_url = null;
     $v->previous_page_url = null;
     $v->next_page_url = null;
     $v->last_page_url = null;
 
-    if ($this->page_type == "album") {
+    if ($this->page_type == "album" || $this->page_type = "tag") {
       $v->page = $this->page;
       $v->max_pages = $this->max_pages;
       $v->total = $this->children_count;
+
+      $model = $this->page_type == "album" ? $this->item : $this->tag;
       if ($this->page != 1) {
-        $v->first_page_url = $this->item->url();
-        $v->previous_page_url = $this->item->url("page=" . ($this->page - 1));
+        $v->first_page_url = $model->url();
+        $v->previous_page_url = $model->url("page=" . ($this->page - 1));
       }
 
       if ($this->page != $this->max_pages) {
-        $v->next_page_url = $this->item->url("page=" . ($this->page + 1));
-        $v->last_page_url = $this->item->url("page={$this->max_pages}");
+        $v->next_page_url = $model->url("page=" . ($this->page + 1));
+        $v->last_page_url = $model->url("page={$this->max_pages}");
       }
 
       $v->first_visible_position = ($this->page - 1) * $this->page_size + 1;
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 4b67157e..fdf22a9e 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -40,7 +40,7 @@
     </li>
     <? endforeach ?>
   </ul>
-  <?= $theme->pager() ?>
+  <?= $theme->paginator() ?>
 
   <? else: ?>
   <p>
-- 
cgit v1.2.3