merging some 5.5 changes and various bugfixes
This commit is contained in:
parent
8061e40dcf
commit
2e791c9dd5
6 changed files with 14 additions and 5 deletions
|
|
@ -471,11 +471,9 @@ sub setStatusDeleted {
|
|||
$self->set({status=>'deleted'});
|
||||
$self->getThread->decrementReplies;
|
||||
$self->getThread->setStatusDeleted if ($self->getThread->get("rootPostId") == $self->get("forumPostId"));
|
||||
if ($self->getThread->get("lastPostId") == $self->get("forumPostId")) {
|
||||
my ($id, $date) = WebGUI::SQL->quickArray("select forumPostId,dateOfPost from forumPost where forumThreadId="
|
||||
.$self->get("forumThreadId")." and status='approved'");
|
||||
$self->getThread->setLastPost($date,$id);
|
||||
}
|
||||
my ($id, $date) = WebGUI::SQL->quickArray("select forumPostId,dateOfPost from forumPost where forumThreadId="
|
||||
.$self->get("forumThreadId")." and status='approved'");
|
||||
$self->getThread->setLastPost($date,$id);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -864,6 +864,9 @@ sub www_process {
|
|||
$hadErrors = 1;
|
||||
delete $var->{entryId};
|
||||
}
|
||||
if ($row{status} eq "hidden") {
|
||||
$value = WebGUI::Macro::process($row{defaultValue});
|
||||
}
|
||||
unless ($hadErrors) {
|
||||
my ($exists) = WebGUI::SQL->quickArray("select count(*) from DataForm_entryData where DataForm_entryId=$entryId
|
||||
and DataForm_fieldId=".quote($row{DataForm_fieldId}));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue