From: wurblzap%gmail.com <>
Date: Wed, 22 Aug 2007 11:38:10 +0000 (+0000)
Subject: Bug 393148 – Template include path used by Bugzilla/Template.pm ordered wrongly.
X-Git-Tag: bugzilla-3.1.2~56
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=878993fbf99144e8c0383cfb9a6226dc70eb8c4b;p=thirdparty%2Fbugzilla.git

Bug 393148 – Template include path used by Bugzilla/Template.pm ordered wrongly.
Follow-up warning fix patch by Marc Schumann <wurblzap@gmail.com>;
r=mkanat; a=mkanat
---

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 9bab77a8a7..cb6b27786b 100644
--- a/Bugzilla/Install/Util.pm
+++ b/Bugzilla/Install/Util.pm
@@ -118,7 +118,7 @@ sub template_include_path {
     # we support every language installed in the template/ directory.
     
     my @wanted;
-    if (defined $params->{only_language}) {
+    if ($params->{only_language}) {
         @wanted = ($params->{only_language});
     }
     else {
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index 6b53d5ae3b..863c815af7 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -85,11 +85,10 @@ sub _load_constants {
 # Templates may also be found in the extensions/ tree
 sub getTemplateIncludePath {
     my $cache = Bugzilla->request_cache;
-    my $lang  = $cache->{'language'} || undef;
+    my $lang  = $cache->{'language'} || '';
     $cache->{"template_include_path_$lang"} ||= template_include_path({
         use_languages => Bugzilla->languages,
         only_language => $lang });
-    $lang ||= '';
     return $cache->{"template_include_path_$lang"};
 }