From 710bd838f97e0dae878b01a86e3f926daac3a2c2 Mon Sep 17 00:00:00 2001
From: Kyle M Hall <kyle@bywatersolutions.com>
Date: Mon, 10 Jun 2013 08:43:22 -0400
Subject: [PATCH] Bug 8190: Followup - Add html embedded logs to OPAC
Content-Type: text/plain; charset=utf-8

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
---
 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 %]
 <!DOCTYPE html>
 [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %]
 <head>
-[%- IF LogToHtmlComments %]
+[%- IF Koha.Preference('LogToHtmlComments') %]
 <!-- LOG MESSAGES
 [% FOREACH message IN Logger.get_messages() %][% message %][% END %]
 -->
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 %]
 <!DOCTYPE html>
 [% IF ( bidi ) %]<html lang="[% lang %]" dir="[% bidi %]">[% ELSE %]<html lang="[% lang %]">[% END %]
 <head>
+[%- IF Koha.Preference('LogToHtmlComments') %]
+<!-- LOG MESSAGES
+[% FOREACH message IN Logger.get_messages() %][% message %][% END %]
+-->
+[% END %]
 <title>
-- 
1.7.7.6