[Koha-cvs] CVS: koha search.pl,1.6.2.17,1.6.2.18

[Finlay Thompson]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv28765

Modified Files:
      Tag: rel-1-2
        search.pl 
Log Message:

resolving some simple conflicts



Index: search.pl
===================================================================
RCS file: /cvsroot/koha/koha/search.pl,v
retrieving revision 1.6.2.17
retrieving revision 1.6.2.18
diff -C2 -r1.6.2.17 -r1.6.2.18
*** search.pl   8 Nov 2002 20:15:39 -0000       1.6.2.17
--- search.pl   13 Nov 2002 03:02:45 -0000      1.6.2.18
***************
*** 12,16 ****
  my $type=$query->param('type');
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
  
--- 12,16 ----
  my $type=$query->param('type');
  
! my ($loggedinuser, $cookie, $sessionID) = checkauth($query, (1);