From b9808b86dfb8363406bc1ffe46f9a663e1813327 Mon Sep 17 00:00:00 2001 From: Chris Cormack Date: Tue, 27 Sep 2011 11:14:06 +1300 Subject: [PATCH] Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited --- edithelp.pl | 3 ++- help.pl | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/edithelp.pl b/edithelp.pl index 4d7e0c0090..32db062291 100755 --- a/edithelp.pl +++ b/edithelp.pl @@ -19,6 +19,7 @@ use strict; use C4::Output; +use C4::Templates; use C4::Auth; use CGI; use warnings; @@ -66,7 +67,7 @@ sub _get_filepath ($;$) { $referer =~ /koha\/(.*)\.pl/; my $from = "help/$1.tt"; my $htdocs = C4::Context->config('intrahtdocs'); - my ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input ); + my ($theme, $lang) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $input ); $debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from"; return "$htdocs/$theme/$lang/modules/$from"; } diff --git a/help.pl b/help.pl index 7208a8a7cb..69e8ab8307 100755 --- a/help.pl +++ b/help.pl @@ -35,10 +35,10 @@ $refer =~ /koha\/(.*)\.pl/; my $from = "modules/help/$1.tt"; my $htdocs = C4::Context->config('intrahtdocs'); -my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query ); +my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query ); unless ( -e "$htdocs/$theme/$lang/$from" ) { $from = "modules/help/nohelp.tt"; - ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query ); + ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query ); } my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from"); $template->param( referer => $refer ); -- 2.39.5