From a5742ebcd2e1f34048d26beca0f621f461dd9ce4 Mon Sep 17 00:00:00 2001
From: Pasi Kallinen <pasi.kallinen@pttk.fi>
Date: Thu, 4 Jul 2013 08:33:25 +0300
Subject: [PATCH] Make the reports UI use UTF-8.

Signed-off-by: Pasi Kallinen <pasi.kallinen@pttk.fi>
---
 Open-ILS/examples/apache/eg_vhost.conf.in    | 7 +++++++
 Open-ILS/examples/apache_24/eg_vhost.conf.in | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/Open-ILS/examples/apache/eg_vhost.conf.in b/Open-ILS/examples/apache/eg_vhost.conf.in
index 60605b3c93..ef203e46f4 100644
--- a/Open-ILS/examples/apache/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache/eg_vhost.conf.in
@@ -522,6 +522,13 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 # ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
+<LocationMatch /reports.*\.x?html>
+    Options +Includes
+    XMLEntContentType "text/html; charset=utf-8"
+    AddOutputFilter INCLUDES;XMLENT .xhtml
+    AddOutputFilter INCLUDES;XMLENT .html
+</LocationMatch>
+
 <LocationMatch /reports>
     Options +Includes
     AddOutputFilter INCLUDES;XMLENT .xhtml
diff --git a/Open-ILS/examples/apache_24/eg_vhost.conf.in b/Open-ILS/examples/apache_24/eg_vhost.conf.in
index b606c0201f..573295015a 100644
--- a/Open-ILS/examples/apache_24/eg_vhost.conf.in
+++ b/Open-ILS/examples/apache_24/eg_vhost.conf.in
@@ -526,6 +526,14 @@ RewriteRule .? - [E=locale:%{HTTP:Accept-Language}]
 # ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
+<LocationMatch /reports.*\.x?html>
+    SSILegacyExprParser on
+    Options +Includes
+    XMLEntContentType "text/html; charset=utf-8"
+    AddOutputFilter INCLUDES;XMLENT .xhtml
+    AddOutputFilter INCLUDES;XMLENT .html
+</LocationMatch>
+
 <LocationMatch /reports>
     SSILegacyExprParser on
     Options +Includes
-- 
2.11.0