From 7658b56714305aef01d3cfcbc4e5d57fcb6ea980 Mon Sep 17 00:00:00 2001
From: "wurblzap%gmail.com"
 <wurblzap%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 22 Aug 2007 06:38:11 +0000
Subject: [PATCH] =?UTF-8?q?Bug=20393148=20=C3=A2=C2=80=C2=93=20Template=20?=
 =?UTF-8?q?include=20path=20used=20by=20Bugzilla/Template.pm=20ordered=20w?=
 =?UTF-8?q?rongly.=20Follow-up=20warning=20fix=20patch=20by=20Marc=20Schum?=
 =?UTF-8?q?ann=20<wurblzap@gmail.com>;=20r=3Dmkanat;=20a=3Dmkanat?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: svn://10.0.0.236/trunk@232833 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Template.pm     | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm b/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
index 9bab77a8a76..cb6b27786b0 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Install/Util.pm
+++ b/mozilla/webtools/bugzilla/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/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm
index 6b53d5ae3be..863c815af72 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm
+++ b/mozilla/webtools/bugzilla/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"};
 }