diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index e9247d3e5..c86511944 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -18,6 +18,7 @@ - fix: Extra tags inserted when viewing only Wiki page - fix: incorrect links generated for Event related links - fix: Sort Collaboration System threads correctly by rating + - fix: Newsletter contains trashed threads (Yung Han Khoe, United Knowledge) 7.4.6 - Prevent Help index from trying to link to non-existant documentation diff --git a/docs/credits.txt b/docs/credits.txt index eb8411e7b..c9605a03f 100644 --- a/docs/credits.txt +++ b/docs/credits.txt @@ -50,6 +50,7 @@ Contributing Developers..............Lucas Bartholemy Matt Wilson / Plain Black Zhou Xiaopeng / WebGUI Worldwide Gerald Young + Yung Han Khoe The following are people/companies who didn't directly contribute diff --git a/lib/WebGUI/Workflow/Activity/SendNewsletters.pm b/lib/WebGUI/Workflow/Activity/SendNewsletters.pm index a2e9bbaed..67a94f354 100644 --- a/lib/WebGUI/Workflow/Activity/SendNewsletters.pm +++ b/lib/WebGUI/Workflow/Activity/SendNewsletters.pm @@ -106,8 +106,8 @@ sub execute { $eh->info("Searching for threads that match $subscription"); my $matchingThreads = $db->read("select metaData_values.assetId from metaData_values left join asset using (assetId) where fieldId=? and value like ? and creationDate > ? - and className like ? and lineage like ?", - [$fieldId, '%'.$value.'%', $lastTimeSent, 'WebGUI::Asset::Post::Thread%', $newsletter->get("lineage").'%']); + and className like ? and lineage like ? and state = ?", + [$fieldId, '%'.$value.'%', $lastTimeSent, 'WebGUI::Asset::Post::Thread%', $newsletter->get("lineage").'%', 'published']); while (my ($threadId) = $matchingThreads->array) { my $thread = WebGUI::Asset->new($self->session, $threadId); if (defined $thread) {