From 0a4166a2bc8d1e8ca4672cf37c2538eabdf34c7f Mon Sep 17 00:00:00 2001 From: "Pierre Habouzit (MadCoder" Date: Thu, 28 Apr 2005 09:19:53 +0000 Subject: [PATCH] backport Patches applied: * opensource@polytechnique.org--2005/platal--release--0.9.5--patch-11 fix #304 git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-598 --- include/search.inc.php | 12 ++++++------ templates/search.tpl | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/search.inc.php b/include/search.inc.php index 271bab1..9990957 100644 --- a/include/search.inc.php +++ b/include/search.inc.php @@ -113,16 +113,16 @@ class XOrgSearch extends XOrgPlugin $page->assign('search_results', $list); $page->assign('search_results_nb', $total); $page->assign('search_page', $offset); - $page->assign('search_pages_nb', $page_max); + $page->assign('search_pages_nb', $page_max+1); $page->assign('search_pages_link', $links); - + $order_links = Array(); foreach ($this->orders as $key=>$o) if ($o[3]) { $order_links[] = Array( - "text"=>$o[2], - "url" =>$this->make_url(Array('order' =>$key,'order_inv'=>($o[0] == $order) && ($order_inv != $o[1]))), - "asc" =>($o[0] == $order) && $order_inv, - "desc"=>($o[0] == $order) && !$order_inv + "text" => $o[2], + "url" => $this->make_url(Array('order' => $key, 'order_inv' => ($o[0] == $order) && ($order_inv != $o[1]))), + "asc" => ($o[0] == $order) && $order_inv, + "desc" => ($o[0] == $order) && !$order_inv ); } $page->assign('search_order_link', $order_links); diff --git a/templates/search.tpl b/templates/search.tpl index a30f4de..22856e8 100644 --- a/templates/search.tpl +++ b/templates/search.tpl @@ -37,8 +37,8 @@ [ {if $tri.asc or $tri.desc}{/if} {$tri.text} - {if $tri.desc}{/if} - {if $tri.asc}{/if} + {if $tri.desc}tri ascendant{/if} + {if $tri.asc}tri descendant{/if} {if $tri.asc or $tri.desc}{/if} ] {/foreach} -- 2.1.4