gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited

This commit is contained in:
Chris Cormack 2011-09-27 11:14:06 +13:00
parent 26acaf3dfa
commit b9808b86df
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
edithelp.pl
View File

@ -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";
}

4
help.pl
View File

@ -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 );