diff --git a/lib/WebGUI/Wobject/MessageBoard.pm b/lib/WebGUI/Wobject/MessageBoard.pm
index 9e28c0c55..346950b2f 100644
--- a/lib/WebGUI/Wobject/MessageBoard.pm
+++ b/lib/WebGUI/Wobject/MessageBoard.pm
@@ -203,9 +203,13 @@ sub www_view {
$html .= $_[0]->description;
$html = $_[0]->processMacros($html);
$html .= '
';
$html .= '';
$html .= '
diff --git a/lib/WebGUI/Wobject/UserSubmission.pm b/lib/WebGUI/Wobject/UserSubmission.pm
index bd0424cb7..9527e03cf 100644
--- a/lib/WebGUI/Wobject/UserSubmission.pm
+++ b/lib/WebGUI/Wobject/UserSubmission.pm
@@ -128,8 +128,12 @@ sub _traditionalView {
}
$sth->finish;
$output .= '';
$p = WebGUI::Paginator->new(WebGUI::URL::page(),\@row,$_[0]->get("submissionsPerPage"));
@@ -428,7 +432,9 @@ sub www_editSubmission {
$submission{convertCarriageReturns} = 1;
$submission{userId} = $session{user}{userId};
}
- if ($submission{userId} == $session{user}{userId} || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
+ if (WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute"))
+ || $submission{userId} == $session{user}{userId}
+ || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
$output = ''.WebGUI::International::get(19,$namespace).'
';
$f = WebGUI::HTMLForm->new;
$f->hidden("wid",$session{form}{wid});
@@ -463,7 +469,9 @@ sub www_editSubmission {
sub www_editSubmissionSave {
my ($sqlAdd,$owner,$image,$attachment,$title);
($owner) = WebGUI::SQL->quickArray("select userId from UserSubmission_submission where submissionId='$session{form}{sid}'");
- if ($owner == $session{user}{userId} || $session{form}{sid} eq "new" || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
+ if ($owner == $session{user}{userId}
+ || ($session{form}{sid} eq "new" && WebGUI::Privilege::isInGroup($_[0]->get("groupToContribute")))
+ || WebGUI::Privilege::isInGroup($_[0]->get("groupToApprove"))) {
if ($session{form}{sid} eq "new") {
$session{form}{sid} = getNextId("submissionId");
WebGUI::SQL->write("insert into UserSubmission_submission (wobjectId,submissionId,userId,username)