From d3d3cfbe72e95ea3e878a46305932fb105782896 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 1 Jul 2013 10:39:06 +0200 Subject: [PATCH] Bug 9811: QA followup removes 2 tabs removes mysqlisms --- C4/Utils/DataTables/Members.pm | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/C4/Utils/DataTables/Members.pm b/C4/Utils/DataTables/Members.pm index 2f99d90..caee98e 100644 --- a/C4/Utils/DataTables/Members.pm +++ b/C4/Utils/DataTables/Members.pm @@ -27,7 +27,7 @@ sub search { } my $dbh = C4::Context->dbh; - my $select = "SELECT SQL_CALC_FOUND_ROWS + my $select = "SELECT borrowers.borrowernumber, borrowers.surname, borrowers.firstname, borrowers.address, borrowers.address2, borrowers.city, borrowers.zipcode, borrowers.country, CAST(borrowers.cardnumber AS UNSIGNED) AS cardnumber, borrowers.dateexpiry, @@ -104,7 +104,7 @@ sub search { my $patrons = $sth->fetchall_arrayref({}); # Get the iTotalDisplayRecords DataTable variable - $query = "SELECT FOUND_ROWS()"; + $query = "SELECT COUNT(*) ". $from . ($where ? $where : ""); $sth = $dbh->prepare($query); $sth->execute; ($iTotalDisplayRecords) = $sth->fetchrow_array; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc index 722fec8..3172208 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-search.inc @@ -91,8 +91,8 @@ [% ELSE %] [% END %] [% END %] -

- [% END %] +

+ [% END %] -- 1.7.10.4