oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ 1299131 ] paragraph tags added every time collaboration message change

Browse source
This commit is contained in:
Matthew Wilson 2005-10-14 17:57:43 +00:00
parent 11bf217ce6
commit 5c47bdf205
2 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/changelog/6.x.x.txt
View file

@ -25,6 +25,8 @@
- Fixed a lot of the www_ methods in Survey.pm to return in styled pages - Fixed a lot of the www_ methods in Survey.pm to return in styled pages
instead of raw <p> tags without <html><head>etc</head><body></body> instead of raw <p> tags without <html><head>etc</head><body></body>
- fix [ 1293897 ] 6.7.4 - asset manager reorder by rank - fix [ 1293897 ] 6.7.4 - asset manager reorder by rank
- fix [ 1299131 ] paragraph tags added every time collaboration message change
6.7.6 6.7.6
- Fixed invalid i18n keys that were causing missing labels. - Fixed invalid i18n keys that were causing missing labels.

10
lib/WebGUI/Asset/Post.pm
View file

@ -630,8 +630,8 @@ sub processPropertiesFromFormPost {
); );
$data{url} = $self->fixUrl($self->getThread->get("url")."/1") if ($self->isReply); $data{url} = $self->fixUrl($self->getThread->get("url")."/1") if ($self->isReply);
if ($self->getThread->getParent->canModerate) { if ($self->getThread->getParent->canModerate) {
$self->getThread->lock if ($session{form}{'lock'}); $self->getThread->lock if ($session{form}{'lock'});
$self->getThread->stick if ($session{form}{stick}); $self->getThread->stick if ($session{form}{stick});
} }
} }
$data{groupIdView} =$self->getThread->getParent->get("groupIdView"); $data{groupIdView} =$self->getThread->getParent->get("groupIdView");
@ -641,9 +641,9 @@ sub processPropertiesFromFormPost {
($data{synopsis}, $data{content}) = $self->getSynopsisAndContentFromFormPost; ($data{synopsis}, $data{content}) = $self->getSynopsisAndContentFromFormPost;
if ($self->getThread->getParent->get("addEditStampToPosts")) { if ($self->getThread->getParent->get("addEditStampToPosts")) {
$data{content} .= "\n\n --- (".WebGUI::International::get('Edited_on','Asset_Post')." ".WebGUI::DateTime::epochToHuman(undef,"%z %Z [GMT%O]").WebGUI::International::get('By','Asset_Post').$session{user}{alias}.") --- \n"; $data{content} .= "\n\n --- (".WebGUI::International::get('Edited_on','Asset_Post')." ".WebGUI::DateTime::epochToHuman(undef,"%z %Z [GMT%O]").WebGUI::International::get('By','Asset_Post').$session{user}{alias}.") --- \n";
} if ($self->getValue("contentType") eq "mixed" || $self->getValue("contentType") eq "html") {
if ($self->getValue("contentType") eq "mixed" || $self->getValue("contentType") eq "html") { $data{content} = '<p>'.$data{content}.'</p>';
$data{content} = '<p>'.$data{content}.'</p>'; }
} }
$self->update(\%data); $self->update(\%data);
$self->getThread->subscribe if ($session{form}{subscribe}); $self->getThread->subscribe if ($session{form}{subscribe});