fixing help feature with new template structure

Signed-off-by: Chris Cormack <crc@liblime.com>

diff --git a/C4/Auth.pm b/C4/Auth.pm
index 07eb0bd..a8f0c87 100644 (file)
--- a/C4/Auth.pm
+++ b/C4/Auth.pm
@@ -143,7 +143,6 @@ sub get_template_and_user {
         $template->param( js_module => $in->{'js_module'} );
         $template->param( js_page => $in->{'js_page'} );
         $template->param( js_widgets => $in->{'js_widgets'} );
-               $template->param( js_includes => $in->{'js_includes'} );
 
                # user info
         $template->param( loggedinusername => $user );

diff --git a/help.pl b/help.pl
index 5568207..3d59165 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -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" );
 
@@ -34,7 +34,7 @@ sub gethelptemplate {
     $htdocs = C4::Context->config('intrahtdocs');
     my ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
     unless ( -e "$htdocs/$theme/$lang/$tmplbase" ) {
-        $tmplbase = "help/nohelp.tmpl";
+        $tmplbase = "modules/help/nohelp.tmpl";
         ( $theme, $lang ) = themelanguage( $htdocs, $tmplbase, "intranet" );
     }
     my $template = HTML::Template->new(