[Koha-cvs] CVS: koha/circ circulation.pl,1.42,1.43

[Andrew Arensburger]

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

Modified Files:
	circulation.pl 
Log Message:
Merged with arensb-context branch: use C4::Context->dbh instead of
&C4Connect, and generally prefer C4::Context over C4::Database.


Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -r1.42 -r1.43
*** circulation.pl	28 Sep 2002 04:59:19 -0000	1.42
--- circulation.pl	5 Oct 2002 10:03:51 -0000	1.43
***************
*** 32,36 ****
  my $headerbackgroundcolor='#99cc33';
  my $circbackgroundcolor='#ffffcc';
! my $circbackgroundcolor='white';
  my $linecolor1='#ffffcc';
  my $linecolor2='white';
--- 32,36 ----
  my $headerbackgroundcolor='#99cc33';
  my $circbackgroundcolor='#ffffcc';
! my $circbackgroundcolor='white';	# FIXME - Duplicate
  my $linecolor1='#ffffcc';
  my $linecolor2='white';
***************
*** 644,648 ****
  
  
! 
  sub printslip {
      my ($env,$borrowernumber)=@_;
--- 644,648 ----
  
  
! # FIXME - This clashes with &C4::Print::printslip
  sub printslip {
      my ($env,$borrowernumber)=@_;