From 5df00737c90058bffeecb55bbc38f3068435c611 Mon Sep 17 00:00:00 2001 From: Bharat Mediratta Date: Sun, 15 Nov 2009 15:24:49 -0800 Subject: Fix a couple of errors in the refctored paginator code: 1) We weren't showing previous page links for albums when we should have 2) We needed to wrap the results of url::merge() in url::site() so that we generate server-relative urls. --- modules/gallery/libraries/Theme_View.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'modules') diff --git a/modules/gallery/libraries/Theme_View.php b/modules/gallery/libraries/Theme_View.php index b5546a43..e98914c4 100644 --- a/modules/gallery/libraries/Theme_View.php +++ b/modules/gallery/libraries/Theme_View.php @@ -154,13 +154,13 @@ class Theme_View_Core extends Gallery_View { $v->total = $this->children_count; if ($this->page != 1) { - $v->first_page_url = url::merge(array("page" => 1)); - $v->first_page_url = url::merge(array("page" => $this->page - 1)); + $v->first_page_url = url::site(url::merge(array("page" => 1))); + $v->previous_page_url = url::site(url::merge(array("page" => $this->page - 1))); } if ($this->page != $this->max_pages) { - $v->next_page_url = url::merge(array("page" => $this->page + 1)); - $v->last_page_url = url::merge(array("page" => $this->max_pages)); + $v->next_page_url = url::site(url::merge(array("page" => $this->page + 1))); + $v->last_page_url = url::site(url::merge(array("page" => $this->max_pages))); } $v->first_visible_position = ($this->page - 1) * $this->page_size + 1; @@ -168,11 +168,11 @@ class Theme_View_Core extends Gallery_View { } else { $v->position = $this->position; $v->total = $this->sibling_count; - if ($v->previous_page = $this->previous_item) { + if ($this->previous_item) { $v->previous_page_url = $this->previous_item->url(); } - if ($v->next_page = $this->next_item) { + if ($this->next_item) { $v->next_page_url = $this->next_item->url(); } } -- cgit v1.2.3