From 794347cde33724384193231e816907d12f4231e8 Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Sat, 2 May 2015 00:02:04 -0400 Subject: [PATCH] Bug 14120: Fixing t/db_dependent/Auth.t noise TEST PLAN --------- 1) $ prove t/db_dependent/Auth.t -- warnings 2) Apply this patch 3) $ prove t/db_dependent/Auth.t -- only one specific type of warning 4) Apply bug 5010 patch 5) $ prove t/db_dependent/Auth.t -- noisy is eliminated 6) koha qa test tools. --- C4/Auth.pm | 2 +- C4/Templates.pm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/C4/Auth.pm b/C4/Auth.pm index 4b02701..9775ee4 100644 --- a/C4/Auth.pm +++ b/C4/Auth.pm @@ -251,7 +251,7 @@ sub get_template_and_user { if ($flags) { foreach my $module ( keys %$all_perms ) { - if ( $flags->{$module} == 1 ) { + if ( defined($flags->{$module}) && $flags->{$module} == 1 ) { foreach my $subperm ( keys %{ $all_perms->{$module} } ) { $template->param( "CAN_user_${module}_${subperm}" => 1 ); } diff --git a/C4/Templates.pm b/C4/Templates.pm index 62a2b55..b7f770d 100644 --- a/C4/Templates.pm +++ b/C4/Templates.pm @@ -161,6 +161,7 @@ sub _get_template_file { my $is_intranet = $interface eq 'intranet'; my $htdocs = C4::Context->config($is_intranet ? 'intrahtdocs' : 'opachtdocs'); my ($theme, $lang, $availablethemes) = themelanguage($htdocs, $tmplbase, $interface, $query); + $lang //= 'en'; my $filename = "$htdocs/$theme/$lang/modules/$tmplbase"; return ($htdocs, $theme, $lang, $filename); -- 2.1.4