vitalif
/
bugzilla-4intranet
mirror of https://github.com/vitalif/bugzilla-4intranet
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix determining of current template name if process() gets a reference to Template::Document

hinted-selects
Vitaliy Filippov 2014-11-14 17:13:54 +03:00
parent 8ce974a469
commit 6ced2fc04b
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Bugzilla/Template/Context.pm
View File

@ -27,10 +27,20 @@ use base qw(Template::Context);
use Bugzilla::Hook;
use Scalar::Util qw(blessed);
sub process {
sub process
{
my $self = shift;
my ($template) = @_;
local $Bugzilla::Template::CURRENT_TEMPLATE = $template =~ /\.tmpl$/ ? $template : $Bugzilla::Template::CURRENT_TEMPLATE;
my $tplname = $Bugzilla::Template::CURRENT_TEMPLATE;
if ($template =~ /\.tmpl$/)
{
$tplname = $template;
}
elsif (blessed $template && $template->isa('Template::Document'))
{
$tplname = $template->{name} || $tplname;
}
local $Bugzilla::Template::CURRENT_TEMPLATE = $tplname;
# We don't want to run the template_before_process hook for
# template hooks (but we do want it to run if a hook calls
# PROCESS inside itself). The problem is that the {component}->{name} of
@ -41,7 +51,8 @@ sub process {
# because that's already part of the extension and they should be able
# to modify their hook if they want (or just modify the variables in the
# calling template).
if (not delete $self->{bz_in_hook}) {
if (not delete $self->{bz_in_hook})
{
$self->{bz_in_process} = 1;
}
my $result = $self->SUPER::process(@_);