diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index 70fb41c35..775f92bc1 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -21,6 +21,8 @@ - fix [ 1170264 ] can't copy file - fix [ 1170242 ] cs email url - fix [ 1171110 ] nav ancestor + - fix [ 1171574 ] purgeList doesn't purgeList + - fix [ 1170244 ] cs notification 6.5.4 diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index 03d02461e..3c6eb3d56 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -768,9 +768,13 @@ Sets the status of this post to pending. sub setStatusPending { my ($self) = @_; - $self->update({status=>'pending'}); - WebGUI::MessageLog::addInternationalizedEntry('',$self->getThread->getParent->get("moderateGroupId"), - $self->getUrl("func=view"),578,'WebGUI','pending'); + if (WebGUI::Grouping::isInGroup($self->getThread->getParent->get("moderateGroupId"))) { + $self->setStatusApproved; + } else { + $self->update({status=>'pending'}); + WebGUI::MessageLog::addInternationalizedEntry('',$self->getThread->getParent->get("moderateGroupId"), + $self->getUrl("func=view"),578,'WebGUI','pending'); + } }