Merge commit 'b8845e25fa' into WebGUI8. Up to 7.10.0

This commit is contained in:
Colin Kuskie 2010-09-22 07:58:06 -07:00
commit 0180b11064
45 changed files with 480 additions and 46 deletions

View file

@ -1635,8 +1635,12 @@ sub www_edit {
});
$var{'userDefined'.$x.'.form.htmlarea'}
= WebGUI::Form::HTMLArea($session, {
name => "userDefined".$x,
value => $userDefinedValue,
name => "userDefined".$x,
value => $userDefinedValue,
richEditId => ($self->isa("WebGUI::Asset::Post::Thread")
? $self->getThread->getParent->get("richEditor")
: $self->getThread->getParent->get("replyRichEditor")
),
});
$var{'userDefined'.$x.'.form.float'}
= WebGUI::Form::Float($session, {