Commit 0528f78d authored by Xavier Guimard's avatar Xavier Guimard

Merge branch 'v2.0'

parents c77783eb f8942d15
......@@ -241,7 +241,7 @@ sub sendHtml {
$args{code} ||= 200;
$args{headers} ||= $req->respHeaders || [];
my $htpl;
$template = $self->templateDir . "/$template.tpl";
$template = ( $args{templateDir} // $self->templateDir ) . "/$template.tpl";
return $self->sendError( $req, "Unable to read $template", 500 )
unless ( -r $template and -f $template );
eval {
......
......@@ -729,9 +729,9 @@ sub _dump {
sub sendHtml {
my ( $self, $req, $template, %args ) = @_;
$self->{templateDir} =
$self->conf->{templateDir} . '/' . $self->getSkin($req);
$args{params}->{TROVER} = $self->trOver;
$args{templateDir} =
$self->conf->{templateDir} . '/' . $self->getSkin($req);
my $res = $self->SUPER::sendHtml( $req, $template, %args );
push @{ $res->[1] },
'X-XSS-Protection' => '1; mode=block',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment