Merge branch 'innodb' into 8
Conflicts: lib/WebGUI/Asset/Wobject/DataForm.pm
This commit is contained in:
commit
8701842829
4 changed files with 3745 additions and 13 deletions
|
|
@ -264,7 +264,7 @@ sub _createForm {
|
|||
elsif ( $class->isa('WebGUI::Form::List') ) {
|
||||
delete $param{size};
|
||||
}
|
||||
elsif ( $type eq 'HTMLArea' && $data->{htmlAreaRichEditor} ne '**Use_Default_Editor**') {
|
||||
elsif ( $type eq 'HTMLArea' && $data->{htmlAreaRichEditor} ne '') {
|
||||
$param{richEditId} = $data->{htmlAreaRichEditor} ;
|
||||
}
|
||||
return $class->new($session, \%param);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue