X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=catalogue%2Fsearch.pl;h=907efdbf99151da2acfcb3f842614191fe7b69cc;hb=37902b25a7aa5c9e1b3f90e8cbb50741b27dae1d;hp=e49507e4a0c2d540a5dd1fb7d472f73c2b90cc54;hpb=8ae5719d1681ffb5bf3dc803de5b80a39b6f3a68;p=koha.git

diff --git a/catalogue/search.pl b/catalogue/search.pl
index e49507e4a0..907efdbf99 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -294,7 +294,7 @@ if ( $template_type eq 'advsearch' ) {
         my $default_sort_by =
             C4::Context->preference('defaultSortField') . '_'
           . C4::Context->preference('defaultSortOrder');
-        $template->param( $default_sort_by => 1 );
+        $template->param( sort_by => $default_sort_by  );
     }
 
     # determine what to display next to the search boxes (ie, boolean option
@@ -369,7 +369,7 @@ if (   C4::Context->preference('defaultSortField')
 @sort_by = split("\0",$params->{'sort_by'}) if $params->{'sort_by'};
 $sort_by[0] = $default_sort_by unless $sort_by[0];
 foreach my $sort (@sort_by) {
-    $template->param($sort => 1);
+    $template->param($sort => 1) if $sort;
 }
 $template->param('sort_by' => $sort_by[0]);
 
@@ -471,7 +471,7 @@ my ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit
 my @results;
 
 ## I. BUILD THE QUERY
-my $lang = C4::Output::getlanguagecookie($cgi);
+my $lang = C4::Templates::getlanguagecookie($cgi);
 ( $error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$stopwords_removed,$query_type) = buildQuery(\@operators,\@operands,\@indexes,\@limits,\@sort_by,$scan,$lang);
 
 ## parse the query_cgi string and put it into a form suitable for <input>s