[Koha-cvs] CVS: koha mainpage.pl,1.2,1.3

[Steve Tonnesen]

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

Modified Files:
        mainpage.pl 
Log Message:
Merging from rel-1-2 to trunk


Index: mainpage.pl
===================================================================
RCS file: /cvsroot/koha/koha/mainpage.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** mainpage.pl 10 Oct 2002 16:15:39 -0000      1.2
--- mainpage.pl 28 Oct 2002 20:02:57 -0000      1.3
***************
*** 4,8 ****
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains picktemplate
  use CGI;
  use C4::Auth;
--- 4,8 ----
  require Exporter;
  use C4::Database;
! use C4::Output;  # contains gettemplate
  use CGI;
  use C4::Auth;
***************
*** 11,15 ****
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
! my $template=gettemplate("intranet-main.tmpl");
  
  print "Content-Type: text/html\n\n", $template->output;
--- 11,15 ----
  my ($loggedinuser, $cookie, $sessionID) = checkauth($query);
  
! my $template = gettemplate("intranet-main.tmpl");
  
  print "Content-Type: text/html\n\n", $template->output;