Merge remote branch 'kc/new/bug_3319' into kcmaster

[koha.git] / members / members-home.pl

diff --git a/members/members-home.pl b/members/members-home.pl
index 2c6d602..00c6034 100755 (executable)
--- a/members/members-home.pl
+++ b/members/members-home.pl
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# Parts Copyright Biblibre 2010
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -27,22 +28,10 @@ use C4::Branch;
 use C4::Category;
 
 my $query = new CGI;
-my $quicksearch = $query->param('quicksearch');
 my $branch = $query->param('branchcode');
-my ($template, $loggedinuser, $cookie);
 my $template_name;
 
-if($quicksearch){
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {borrowers => 1},
-                 debug => 1,
-                 });
-} else {
-($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
                  query => $query,
                  type => "intranet",
@@ -50,7 +39,6 @@ if($quicksearch){
                  flagsrequired => {borrowers => 1},
                  debug => 1,
                  });
-}
 
 my $branches = GetBranches;
 my @branchloop;
@@ -75,15 +63,18 @@ else {
 }
 
 @categories=C4::Category->all;
-if(scalar(@categories) < 1){ $no_categories = 1; }
+if(scalar(@categories) < 1){ 
+    $no_categories = 1; 
+}
+
 if($no_categories && C4::Context->preference("AddPatronLists")=~/code/){
     $no_add = 1;
     $template->param(no_categories => 1);
-} else {
+} 
+else {
     $template->param(categories=>\@categories);
 }
 
-
 $template->param( 
         "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
         no_add => $no_add,