merging 7.1.3 changes
This commit is contained in:
parent
6c46d97eea
commit
b9010b8c07
7 changed files with 33 additions and 10 deletions
|
|
@ -494,6 +494,7 @@ sub getTemplateVars {
|
|||
});
|
||||
}
|
||||
}
|
||||
delete $var{'attachment_loop'} unless (scalar(@{$var{'attachment_loop'}}));
|
||||
return \%var;
|
||||
}
|
||||
|
||||
|
|
@ -635,6 +636,7 @@ sub notifySubscribers {
|
|||
my $thread = $self->getThread;
|
||||
my $cs = $thread->getParent;
|
||||
$cs->appendTemplateLabels($var);
|
||||
$var->{relativeUrl} = $var->{url};
|
||||
my $siteurl = $self->session->url->getSiteURL();
|
||||
$var->{url} = $siteurl.$self->getUrl;
|
||||
$var->{'notify.subscription.message'} = $i18n->get(875,"Asset_Post");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue