From 1c41994e12d7b67f867f9f3ba5df7e3bdc28e724 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 10 Jun 2013 08:43:22 -0400 Subject: [PATCH] Bug 8190 - Add a logging module to Koha - Followup - Add html embedded logs to OPAC Signed-off-by: Marcel de Rooy Content-Type: text/plain; charset=utf-8 --- C4/Auth.pm | 3 +-- .../prog/en/includes/doc-head-open.inc | 3 ++- .../opac-tmpl/prog/en/includes/doc-head-open.inc | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 4607345..803608a 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -329,6 +329,7 @@ sub get_template_and_user { marcflavour => C4::Context->preference("marcflavour"), persona => C4::Context->preference("persona"), UseCourseReserves => C4::Context->preference("UseCourseReserves"), + Logger => C4::Context->logger(), ); if ( $in->{'type'} eq "intranet" ) { $template->param( @@ -361,8 +362,6 @@ sub get_template_and_user { AllowMultipleCovers => C4::Context->preference('AllowMultipleCovers'), EnableBorrowerFiles => C4::Context->preference('EnableBorrowerFiles'), UseKohaPlugins => C4::Context->preference('UseKohaPlugins'), - LogToHtmlComments => C4::Context->preference('LogToHtmlComments'), - Logger => C4::Context->logger(), ); } else { diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc index 512084c..58132eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/doc-head-open.inc @@ -1,7 +1,8 @@ +[% USE Koha %] [% IF ( bidi ) %][% ELSE %][% END %] -[%- IF LogToHtmlComments %] +[%- IF Koha.Preference('LogToHtmlComments') %] diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc index 970324c..e083858 100644 --- a/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc +++ b/koha-tmpl/opac-tmpl/prog/en/includes/doc-head-open.inc @@ -1,4 +1,10 @@ +[% USE Koha %] [% IF ( bidi ) %][% ELSE %][% END %] +[%- IF Koha.Preference('LogToHtmlComments') %] + +[% END %] -- 1.7.7.6