From 878993fbf99144e8c0383cfb9a6226dc70eb8c4b Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com" <>
Date: Wed, 22 Aug 2007 11:38:10 +0000
Subject: 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
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Bugzilla/Install/Util.pm | 2 +-
 Bugzilla/Template.pm     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Bugzilla/Install/Util.pm b/Bugzilla/Install/Util.pm
index 9bab77a8a..cb6b27786 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 6b53d5ae3..863c815af 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"};
 }
 
-- 
cgit v1.2.3-24-g4f1b