diff options
| author | wurblzap%gmail.com <> | 2007-08-22 13:38:10 +0200 |
|---|---|---|
| committer | wurblzap%gmail.com <> | 2007-08-22 13:38:10 +0200 |
| commit | 878993fbf99144e8c0383cfb9a6226dc70eb8c4b (patch) | |
| tree | 4399f0c7bd84fa8d8c618bbd195b12c68daa3ac0 | |
| parent | f192744dc50afee92ad585fdedf17f61dc5263a3 (diff) | |
| download | bugzilla-878993fbf99144e8c0383cfb9a6226dc70eb8c4b.tar.gz bugzilla-878993fbf99144e8c0383cfb9a6226dc70eb8c4b.tar.xz | |
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
| -rw-r--r-- | Bugzilla/Install/Util.pm | 2 | ||||
| -rw-r--r-- | 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"}; } |