Merge remote-tracking branch 'kc/new/bug_5616' into kcmaster

[koha.git] / help.pl

diff --git a/help.pl b/help.pl
index 58354b0..18d27dd 100755 (executable)
--- a/help.pl
+++ b/help.pl
@@ -28,18 +28,14 @@ use CGI;
 my $query = new CGI;
 
 # find the script that called the online help using the CGI referer()
-our $refer = $query->referer();
+our $refer = $query->param('url');
+$refer = $query->referer()  if !$refer || $refer eq 'undefined';
 
 $refer =~ /koha\/(.*)\.pl/;
-my $from = "modules/help/$1.tt";
-
-my $htdocs = C4::Context->config('intrahtdocs');
-my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
-unless ( -e "$htdocs/$theme/$lang/$from" ) {
-    $from = "modules/help/nohelp.tt";
-    ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
-}
-my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
+my $from = "help/$1.tt";
+
+my $template = C4::Templates::gettemplate($from, 'intranet', $query);
+$template->param( referer => $refer );
 
 output_html_with_http_headers $query, "", $template->output;