diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index 7e308d648..06befb3e0 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -9,6 +9,8 @@ - Added Chinese character support to search engine and indexer thanks to Zhou Xiaopeng. - fix: issue with recursive ldap filter causing it not to work properly + - Added an unsubscribe link to the messages generated by collaboration + subscriptions per the laws in various countries. 7.0.1 - fix: User profile field "Department" needs i18n diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index d95a32d5e..0d6b03e78 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -633,6 +633,7 @@ sub notifySubscribers { $var->{url} = $self->session->url->getSiteURL().$self->getUrl; $var->{'notify.subscription.message'} = $i18n->get(875,"Asset_Post"); my $message = $self->processTemplate($var, $self->getThread->getParent->get("notificationTemplateId")); + my $unsubscribe = '
'; my $from = $self->getThread->getParent->get("mailAddress"); my $subject = $self->getThread->getParent->get("mailPrefix").$self->get("title"); my $mail = WebGUI::Mail::Send->create($self->session, { @@ -641,7 +642,7 @@ sub notifySubscribers { subject=>$subject, messageId=>"cs-".$self->getId }); - $mail->addHtml($message); + $mail->addHtml($message.$unsubscribe); $mail->addFooter; $mail->queue; my $mail = WebGUI::Mail::Send->create($self->session, { @@ -650,7 +651,8 @@ sub notifySubscribers { subject=>$subject, messageId=>"cs-".$self->getId }); - $mail->addHtml($message); + $unsubscribe = ''; + $mail->addHtml($message.$unsubscribe); $mail->addFooter; $mail->queue; }