[Koha-cvs] CVS: koha/tmpl opacmain.pl,1.1.2.1,1.1.2.2

[Finlay Thompson]

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

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

Altered to use the new themelanguage method in Output.pm


Index: opacmain.pl
===================================================================
RCS file: /cvsroot/koha/koha/tmpl/Attic/opacmain.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** opacmain.pl	11 Sep 2002 01:58:20 -0000	1.1.2.1
--- opacmain.pl	11 Sep 2002 03:56:26 -0000	1.1.2.2
***************
*** 28,37 ****
  }
  
! my $includes=$configfile{'includes'};
! ($includes) || ($includes="/usr/local/www/hdl/htdocs/includes");
! my $templatebase="opac/opac-main.tmpl";
! my $theme=picktemplate($includes, $templatebase);
  
! my $template = HTML::Template->new(filename => "$includes/templates/$theme/$templatebase", die_on_bad_params => 0, path => [$includes]);
  
  #$template->param(SITE_RESULTS => $sitearray);
--- 28,36 ----
  }
  
! my $htdocs=$configfile{'opachtdocs'};
! my $templatebase="opac-main.tmpl";
! my ($theme, $lang)=themelanguage($htdocs, $templatebase);
  
! my $template = HTML::Template->new(filename => "$htdocs/$theme/$lang/$templatebase", die_on_bad_params => 0, path => ["$htdocs/includes"]);
  
  #$template->param(SITE_RESULTS => $sitearray);