bug 1980 [3/3]: remove bug workaround from pagination links

yesterday, the C4::Output::pagination_bar had a bug in it that I was crudely working around.
atz fixed that bug this morning. This patch removes the workaround. Thanks, atz!

I'm sending along atz's patch again with my signoff. It needs to be applied before this, as does the
other 1980 patch. I have sent that along (again), too, with a modified subject line. That makes a total of 3 patches for 1980.

Signed-off-by: Joshua Ferraro <jmf@liblime.com>

diff --git a/acqui/neworderbiblio.pl b/acqui/neworderbiblio.pl
index d1f1932..c314ea9 100755 (executable)
--- a/acqui/neworderbiblio.pl
+++ b/acqui/neworderbiblio.pl
@@ -127,8 +127,7 @@ $template->param(
     opaclayoutstylesheet => C4::Context->preference("opaclayoutstylesheet"),
     opaccolorstylesheet  => C4::Context->preference("opaccolorstylesheet"),
     "BiblioDefaultView".C4::Context->preference("IntranetBiblioDefaultView") => 1,
-    # FIXME: pagination_bar doesn't work right with only one pair of CGI params, so I put two in.
-    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?bug=fix&q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+    pagination_bar       => pagination_bar( "$ENV{'SCRIPT_NAME'}?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
 );
 
 # BUILD THE TEMPLATE

diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index 8e5327e..2f43feb 100755 (executable)
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -84,8 +84,7 @@ if ($query) {
         total          => $total_hits,
         query          => $query,
         resultsloop    => \@newresults,
-        # FIXME: pagination_bar doesn't work right with only one pair of CGI params, so I put two in.
-        pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?bug=fix&q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
+        pagination_bar => pagination_bar( "/cgi-bin/koha/cataloguing/addbooks.pl?q=$query&", getnbpages( $total_hits, $results_per_page ), $page, 'page' ),
     );
 }