[Koha-cvs] CVS: koha/C4 Output.pm,1.43,1.44

[Mike Hansen]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1:/tmp/cvs-serv30610/koha/C4

Modified Files:
        Output.pm 
Log Message:
Fixed theme/language templating in intranet.


Index: Output.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Output.pm,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -r1.43 -r1.44
*** Output.pm   4 Apr 2003 08:41:15 -0000       1.43
--- Output.pm   13 May 2003 05:10:07 -0000      1.44
***************
*** 89,93 ****
        }
  
!       my ($theme, $lang) = themelanguage($htdocs, $tmplbase);
  
        my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",
--- 89,93 ----
        }
  
!       my ($theme, $lang) = themelanguage($htdocs, $tmplbase, $opac);
  
        my $template = HTML::Template->new(filename      => 
"$htdocs/$theme/$lang/$tmplbase",
***************
*** 107,117 ****
  # FIXME - POD
  sub themelanguage {
!   my ($htdocs, $tmpl) = @_;
  
    my $dbh = C4::Context->dbh;
!   my @languages = split " ", C4::Context->preference("opaclanguages");
!                       # language preference
!   my @themes = split " ", C4::Context->preference("opacthemes");
!                       # theme preferences
  
    my ($theme, $lang);
--- 107,125 ----
  # FIXME - POD
  sub themelanguage {
!   my ($htdocs, $tmpl, $section) = @_;
  
    my $dbh = C4::Context->dbh;
!   my @languages;
!   my @themes;
!   if ( $section eq "intranet")
!   {
!     @languages = split " ", C4::Context->preference("opaclanguages");
!     @themes = split " ", C4::Context->preference("template");
!   }
!   else
!   {
!     @languages = split " ", C4::Context->preference("opaclanguages");
!     @themes = split " ", C4::Context->preference("opacthemes");
!   }
  
    my ($theme, $lang);