Bugzilla – Attachment 5600 Details for
Bug 6923
can't load help files
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
Bug-6923--Fixing-a-bug-introduced-by-6755---was-bl.patch (text/plain), 1.78 KB, created by
Chris Cormack
on 2011-09-26 22:15:54 UTC
(
hide
)
Description:
Bug 6923 : Fixing a bug introduced by 6755 - was blocking help being used or edited
Filename:
MIME Type:
Creator:
Chris Cormack
Created:
2011-09-26 22:15:54 UTC
Size:
1.78 KB
patch
obsolete
>From b9808b86dfb8363406bc1ffe46f9a663e1813327 Mon Sep 17 00:00:00 2001 >From: Chris Cormack <chrisc@catalyst.net.nz> >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 4d7e0c0..32db062 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 7208a8a..69e8ab8 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 ); >-- >1.7.4.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 6923
: 5600