X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=help.pl;h=ff02bd92b6e6311da97574dc4090cd734b8f863d;hb=234ee5f2c02be8a8b3d0b4676367df13992747e4;hp=55682076885cc0da74ad755ed73e4739cfb885e3;hpb=ebb3697a4dc4b14c1956222dcb89bb7809a7b6fe;p=koha.git

diff --git a/help.pl b/help.pl
index 5568207688..ff02bd92b6 100755
--- a/help.pl
+++ b/help.pl
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
-use HTML::Template;
+
 use strict;
-require Exporter;
-use C4::Output;    # contains gettemplate
+use HTML::Template::Pro;
 
+use C4::Output;    # contains gettemplate
 # use C4::Auth;
 use C4::Context;
 use CGI;
@@ -11,7 +11,7 @@ use CGI;
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-my $refer = $query->referer();
+our $refer = $query->referer();
 
 # workaround for popup not functioning correctly in IE
 my $referurl = $query->param('url');
@@ -20,7 +20,7 @@ if ($referurl) {
 }
 
 $refer =~ /.*koha\/(.*)\.pl.*/;
-my $from = "help/$1.tmpl";
+my $from = "modules/help/$1.tmpl";
 
 my $template = gethelptemplate( $from, "intranet" );
 
@@ -32,12 +32,12 @@ sub gethelptemplate {
 
     my $htdocs;
     $htdocs = C4::Context->config('intrahtdocs');
-    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+    my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "help/nohelp.tmpl";
-        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
+        $tmplbase = "modules/help/nohelp.tmpl";
+        ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet", $query );
     }
-    my $template = HTML::Template->new(
+    my $template = HTML::Template::Pro->new(
         filename          => "$htdocs/$theme/$lang/$tmplbase",
         die_on_bad_params => 0,
         global_vars       => 1,
@@ -54,6 +54,7 @@ sub gethelptemplate {
           C4::Context->preference("intranetcolorstylesheet"),
         intranetstylesheet => C4::Context->preference("intranetstylesheet"),
         IntranetNav        => C4::Context->preference("IntranetNav"),
+		yuipath => (C4::Context->preference("yuipath") eq "local"?"/intranet-tmpl/$theme/$lang/lib/yui":C4::Context->preference("yuipath")),
         referer            => $refer,
     );
     return $template;