diff options
author | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-02-28 17:33:29 -0800 |
---|---|---|
committer | Max Kanat-Alexander <mkanat@bugzilla.org> | 2010-02-28 17:33:29 -0800 |
commit | 78be753e3be38903b0eeb81e36a7c51704bc6cf3 (patch) | |
tree | 295e7a99a07ed742872570d1ecf72f4312978109 /Bugzilla.pm | |
parent | 5080ecd2f4c2711b228127e1c12647906d37f3bd (diff) | |
download | bugs-78be753e3be38903b0eeb81e36a7c51704bc6cf3.tar bugs-78be753e3be38903b0eeb81e36a7c51704bc6cf3.tar.gz bugs-78be753e3be38903b0eeb81e36a7c51704bc6cf3.tar.bz2 bugs-78be753e3be38903b0eeb81e36a7c51704bc6cf3.tar.xz bugs-78be753e3be38903b0eeb81e36a7c51704bc6cf3.zip |
Bug 508823: Make it so that you don't ever have to reset template_inner (like
Bugzilla->template_inner("")).
r=LpSolit, a=LpSolit
Diffstat (limited to 'Bugzilla.pm')
-rw-r--r-- | Bugzilla.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Bugzilla.pm b/Bugzilla.pm index fb640091e..e8a405412 100644 --- a/Bugzilla.pm +++ b/Bugzilla.pm @@ -176,17 +176,17 @@ sub init_page { sub template { my $class = shift; - $class->request_cache->{language} = ""; $class->request_cache->{template} ||= Bugzilla::Template->create(); return $class->request_cache->{template}; } sub template_inner { my ($class, $lang) = @_; - $lang = defined($lang) ? $lang : ($class->request_cache->{language} || ""); - $class->request_cache->{language} = $lang; + my $cache = $class->request_cache; + my $current_lang = $cache->{template_current_lang}->[0]; + $lang ||= $current_lang || ''; $class->request_cache->{"template_inner_$lang"} - ||= Bugzilla::Template->create(); + ||= Bugzilla::Template->create(language => $lang); return $class->request_cache->{"template_inner_$lang"}; } |