From 440da51367c1e901a7943c202542a4a5ad6cc776 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 8 Jul 2014 11:41:11 -0300 Subject: [PATCH] Bug 11349: Remove unnecesary name translation Since all scripts use the '.tt' sufix for template names there's no need for and regexp that changes from '.tmpl' to '.tt'. Regards To+ Signed-off-by: Chris Cormack Signed-off-by: Jonathan Druart --- C4/InstallAuth.pm | 2 -- C4/Templates.pm | 17 ----------------- 2 files changed, 19 deletions(-) diff --git a/C4/InstallAuth.pm b/C4/InstallAuth.pm index 7657fe2..35ac2e1 100644 --- a/C4/InstallAuth.pm +++ b/C4/InstallAuth.pm @@ -111,7 +111,6 @@ sub get_template_and_user { my $path = C4::Context->config('intrahtdocs'). "/prog/". $language; my $tmplbase = $in->{template_name}; - $tmplbase=~ s/\.tmpl$/.tt/; my $filename = "$path/modules/" . $tmplbase; my $interface = 'intranet'; my $template = C4::Templates->new( $interface, $filename, $tmplbase, $query); @@ -372,7 +371,6 @@ sub checkauth { C4::Context->config('intrahtdocs') . "/prog/" . ( $query->param('language') ? $query->param('language') : "en" ); my $filename = "$path/modules/$template_name"; - $filename =~ s/\.tmpl$/.tt/; my $interface = 'intranet'; my $template = C4::Templates->new( $interface, $filename, '', $query); $template->param( diff --git a/C4/Templates.pm b/C4/Templates.pm index b326f53..e6675d2 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -217,28 +217,11 @@ sub gettemplate { my ( $tmplbase, $interface, $query, $is_plugin ) = @_; ($query) or warn "no query in gettemplate"; my $path = C4::Context->preference('intranet_includes') || 'includes'; - $tmplbase =~ s/\.tmpl$/.tt/; my ($htdocs, $theme, $lang, $filename) = _get_template_file($tmplbase, $interface, $query); $filename = $tmplbase if ( $is_plugin ); my $template = C4::Templates->new($interface, $filename, $tmplbase, $query); -# NOTE: Commenting these out rather than deleting them so that those who need -# to know how we previously shimmed these directories will be able to understand. -# my $is_intranet = $interface eq 'intranet'; -# my $themelang = -# ($is_intranet ? '/intranet-tmpl' : '/opac-tmpl') . -# "/$theme/$lang"; -# $template->param( -# themelang => $themelang, -# yuipath => C4::Context->preference("yuipath") eq "local" -# ? "$themelang/lib/yui" -# : C4::Context->preference("yuipath"), -# interface => $is_intranet ? '/intranet-tmpl' : '/opac-tmpl', -# theme => $theme, -# lang => $lang -# ); - # Bidirectionality, must be sent even if is the only language my $current_lang = regex_lang_subtags($lang); my $bidi; -- 2.0.0.rc2