From 1ae8494e23c824aab5052772e202b8ee75745cbb Mon Sep 17 00:00:00 2001 From: Lars Dieckow Date: Fri, 14 Jun 2013 13:04:41 +0200 Subject: [PATCH] automatic UTF-8 decoding/encoding --- lib/NGCP/Panel.pm | 2 +- lib/NGCP/Panel/Model/billing.pm | 6 ++++-- lib/NGCP/Panel/Model/provisioning.pm | 6 ++++-- lib/NGCP/Panel/View/HTML.pm | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/lib/NGCP/Panel.pm b/lib/NGCP/Panel.pm index a5ba5a8891..5d44cf3267 100644 --- a/lib/NGCP/Panel.pm +++ b/lib/NGCP/Panel.pm @@ -45,7 +45,7 @@ __PACKAGE__->config( # Disable deprecated behavior needed by old applications disable_component_resolution_regex_fallback => 1, enable_catalyst_header => 1, # Send X-Catalyst header - + encoding => 'UTF-8', 'View::HTML' => { INCLUDE_PATH => [ __PACKAGE__->path_to('share', 'templates'), diff --git a/lib/NGCP/Panel/Model/billing.pm b/lib/NGCP/Panel/Model/billing.pm index 919c48500c..b24b10fc1b 100644 --- a/lib/NGCP/Panel/Model/billing.pm +++ b/lib/NGCP/Panel/Model/billing.pm @@ -4,7 +4,9 @@ use Module::Runtime qw(use_module); extends 'Catalyst::Model::DBIC::Schema'; +my $connect_info = use_module(NGCP::Panel->config->{'Model::billing'}{schema_class})->config->as_hash->{billingdb}; +$connect_info->{mysql_enable_utf8} = 1; + __PACKAGE__->config( - connect_info => - use_module(NGCP::Panel->config->{'Model::billing'}{schema_class})->config->as_hash->{billingdb} + connect_info => $connect_info, ); diff --git a/lib/NGCP/Panel/Model/provisioning.pm b/lib/NGCP/Panel/Model/provisioning.pm index 86b8134d08..8c79b135aa 100644 --- a/lib/NGCP/Panel/Model/provisioning.pm +++ b/lib/NGCP/Panel/Model/provisioning.pm @@ -4,7 +4,9 @@ use Module::Runtime qw(use_module); extends 'Catalyst::Model::DBIC::Schema'; +my $connect_info = use_module(NGCP::Panel->config->{'Model::provisioning'}{schema_class})->config->as_hash->{provisioningdb}; +$connect_info->{mysql_enable_utf8} = 1; + __PACKAGE__->config( - connect_info => - use_module(NGCP::Panel->config->{'Model::provisioning'}{schema_class})->config->as_hash->{provisioningdb} + connect_info => $connect_info, ); diff --git a/lib/NGCP/Panel/View/HTML.pm b/lib/NGCP/Panel/View/HTML.pm index 955776de03..311e35c856 100644 --- a/lib/NGCP/Panel/View/HTML.pm +++ b/lib/NGCP/Panel/View/HTML.pm @@ -7,7 +7,7 @@ extends 'Catalyst::View::TT'; __PACKAGE__->config( TEMPLATE_EXTENSION => '.tt', render_die => 1, - + ENCODING => 'UTF-8', WRAPPER => 'wrapper.tt' );