From 1923629300277fbbe20c586ae6e97fb6b7685e31 Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 7 Mar 2005 08:55:29 +0000 Subject: [PATCH] synch'ing with 2.2 --- C4/AuthoritiesMarc.pm | 4 ++-- C4/Biblio.pm | 4 ++-- C4/SearchMarc.pm | 2 +- koha-tmpl/opac-tmpl/css/en/opac-search.tmpl | 10 +--------- koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl | 2 +- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/C4/AuthoritiesMarc.pm b/C4/AuthoritiesMarc.pm index fd1a20f4b6..00d57b0142 100644 --- a/C4/AuthoritiesMarc.pm +++ b/C4/AuthoritiesMarc.pm @@ -858,8 +858,8 @@ Paul POULAIN paul.poulain@free.fr # $Id$ # $Log$ -# Revision 1.10 2005/03/01 13:40:48 tipaul -# merging 2.2 branch with head. Sorry for not making it before, many many commits done here +# Revision 1.11 2005/03/07 08:55:29 tipaul +# synch'ing with 2.2 # # Revision 1.9.2.2 2005/02/28 14:03:13 tipaul # * adding search on "main entry" (ie $a subfield) on a given authority (the "search everywhere" field is still here). diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 125fdd78a2..f870afe43d 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -2653,8 +2653,8 @@ Paul POULAIN paul.poulain@free.fr # $Id$ # $Log$ -# Revision 1.116 2005/03/01 13:40:48 tipaul -# merging 2.2 branch with head. Sorry for not making it before, many many commits done here +# Revision 1.117 2005/03/07 08:55:29 tipaul +# synch'ing with 2.2 # # Revision 1.115.2.5 2005/02/24 13:54:04 tipaul # exporting MARCdelsubfield sub. It's used in authority merging. diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm index a033c661d0..c3b81b13e4 100644 --- a/C4/SearchMarc.pm +++ b/C4/SearchMarc.pm @@ -165,7 +165,7 @@ $marcflavour ("MARC21" or "UNIMARC") determines which tags are used for retrievi =cut sub catalogsearch { - my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby, $desc_or_asc) = @_; + my ($dbh, $tags, $and_or, $excluding, $operator, $value, $offset,$length,$orderby) = @_; # build the sql request. She will look like : # select m1.bibid # from marc_subfield_table as m1, marc_subfield_table as m2 diff --git a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl index e20e96d8f5..b6f1fa36de 100644 --- a/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl +++ b/koha-tmpl/opac-tmpl/css/en/opac-search.tmpl @@ -113,8 +113,7 @@

-

- +

Results per page :

-

- - -

diff --git a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl index a1bc804cb7..058c844c5b 100644 --- a/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl +++ b/koha-tmpl/opac-tmpl/css/en/opac-serial-issues.tmpl @@ -75,7 +75,7 @@ since

- +

Issues summary

-- 2.39.5