From 12de382a4c7c9e12b4c9edd983b38f7b232b5be8 Mon Sep 17 00:00:00 2001
From: Robert Sesek <rsesek@bluestatic.org>
Date: Fri, 22 Aug 2008 00:10:55 -0400
Subject: [PATCH] Get pagination working on index.php

---
 includes/pagination.php   | 10 +++++++---
 index.php                 |  4 ++--
 templates/pagenav.tpl     |  2 +-
 templates/pagenav_bit.tpl |  2 +-
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/includes/pagination.php b/includes/pagination.php
index 52a69c2..2984e8c 100644
--- a/includes/pagination.php
+++ b/includes/pagination.php
@@ -54,7 +54,8 @@ class Pagination extends BSPagination
 		$template->vars = array(
 			'baselink'	=> $baselink,
 			'nolink'	=> $isCurrent,
-			'number'	=> $pagenumber
+			'number'	=> $pagenumber,
+			'paginator'	=> $this
 		);
 		return $template->evaluate()->getTemplate();
 	}
@@ -62,14 +63,17 @@ class Pagination extends BSPagination
 	/**
 	 * Generates the entire page navigation HTML
 	 */
-	protected function _navigationProcessor($baselink, $next, $prev, $show, $bits)
+	protected function _navigationProcessor($baselink, $next, $prev, $show2, $bits)
 	{
+		global $show;
+		
+		$show = array_merge($show, $show2);
+		
 		$template = new BSTemplate('pagenav');
 		$template->vars = array(
 			'baselink'	=> $baselink,
 			'nextpage'	=> $next,
 			'prevpage'	=> $prev,
-			'show'		=> $show,
 			'pagebits'	=> $bits,
 			'paginator'	=> $this
 		);
diff --git a/index.php b/index.php
index f83d602..eea2ec8 100644
--- a/index.php
+++ b/index.php
@@ -76,12 +76,12 @@ $bugs_fetch->free();
 
 $columnHeads = $sort->constructColumnHeaders(true, 'p=' . $pagination->page . '&amp;pp=' . $pagination->perpage);
 $show['pagenav'] = ($pagination->getPageCount() > 1);
-$pagenav = $pagination->constructPageNav($sort->fetch_sort_link($sort->sortkey));
 
 $tpl = new BSTemplate('trackerhome');
 $tpl->vars = array(
 	'columnHeads'	=> $columnHeads,
-	'bugs'			=> $bugs
+	'bugs'			=> $bugs,
+	'pagenav'		=> $pagination->constructPageNav($sort->fetch_sort_link($sort->sortkey))
 );
 $tpl->evaluate()->flush();
 
diff --git a/templates/pagenav.tpl b/templates/pagenav.tpl
index 73784e9..5c9e252 100644
--- a/templates/pagenav.tpl
+++ b/templates/pagenav.tpl
@@ -1,7 +1,7 @@
 <div>
 	<% if ($show['first']): %><a href="<%- $baselink %>p=1&amp;pp=<%- $paginator->perpage %>"><%-T("First")%></a> ...<% endif %>
 	<% if ($show['prev']): %><a href="<%- $baselink %>p=<%- $prevpage %>&amp;pp=<%- $paginator->perpage %>"><%-T("Prev")%></a> ...<% endif %>
-$pagebits
+<%- $pagebits %>
 	<% if ($show['next']): %>... <a href="<%- $baselink %>p=<%- $nextpage %>&amp;pp=<%- $paginator->perpage %>"><%-T("Next")%></a><% endif %>
 	<% if ($show['last']): %>... <a href="<%- $baselink %>p=<%- $paginator->pagecount %>&amp;pp=<%- $paginator->perpage %>"><%-T("Last")%></a><% endif %>
 </div>
\ No newline at end of file
diff --git a/templates/pagenav_bit.tpl b/templates/pagenav_bit.tpl
index 9d96fe1..5bdd62f 100644
--- a/templates/pagenav_bit.tpl
+++ b/templates/pagenav_bit.tpl
@@ -1 +1 @@
-	<% if ($nolink): %><strong><%- $number %></strong><% else: %><a href="<%- $baselink %>p=$number&amp;pp=<%- $paginator->perpage %>"><%- $number %></a><% endif %>
\ No newline at end of file
+	<% if ($nolink): %><strong><%- $number %></strong><% else: %><a href="<%- $baselink %>p=<%- $number %>&amp;pp=<%- $paginator->perpage %>"><%- $number %></a><% endif %>
\ No newline at end of file
-- 
2.22.5