View | Details | Raw Unified | Return to bug 6923
Collapse All | Expand All

(-)a/edithelp.pl (-1 / +2 lines)
Lines 19-24 Link Here
19
19
20
use strict;
20
use strict;
21
use C4::Output;
21
use C4::Output;
22
use C4::Templates;
22
use C4::Auth;
23
use C4::Auth;
23
use CGI;
24
use CGI;
24
use warnings;
25
use warnings;
Lines 66-72 sub _get_filepath ($;$) { Link Here
66
    $referer =~ /koha\/(.*)\.pl/;
67
    $referer =~ /koha\/(.*)\.pl/;
67
    my $from = "help/$1.tt";
68
    my $from = "help/$1.tt";
68
    my $htdocs = C4::Context->config('intrahtdocs');
69
    my $htdocs = C4::Context->config('intrahtdocs');
69
    my ($theme, $lang) = themelanguage( $htdocs, $from, "intranet", $input );
70
    my ($theme, $lang) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $input );
70
	$debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from";
71
	$debug and print STDERR "help filepath: $htdocs/$theme/$lang/modules/$from";
71
	return "$htdocs/$theme/$lang/modules/$from";
72
	return "$htdocs/$theme/$lang/modules/$from";
72
}
73
}
(-)a/help.pl (-3 / +2 lines)
Lines 35-44 $refer =~ /koha\/(.*)\.pl/; Link Here
35
my $from = "modules/help/$1.tt";
35
my $from = "modules/help/$1.tt";
36
36
37
my $htdocs = C4::Context->config('intrahtdocs');
37
my $htdocs = C4::Context->config('intrahtdocs');
38
my ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
38
my ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
39
unless ( -e "$htdocs/$theme/$lang/$from" ) {
39
unless ( -e "$htdocs/$theme/$lang/$from" ) {
40
    $from = "modules/help/nohelp.tt";
40
    $from = "modules/help/nohelp.tt";
41
    ( $theme, $lang ) = themelanguage( $htdocs, $from, "intranet", $query );
41
    ( $theme, $lang ) = C4::Templates::themelanguage( $htdocs, $from, "intranet", $query );
42
}
42
}
43
my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
43
my $template = C4::Templates->new('intranet', "$htdocs/$theme/$lang/$from");
44
$template->param( referer => $refer );
44
$template->param( referer => $refer );
45
- 

Return to bug 6923