mirror of
https://github.com/humhub/humhub.git
synced 2025-01-17 14:18:27 +01:00
Merge branch 'master' into develop
This commit is contained in:
commit
6f5c1485cf
@ -1,6 +1,10 @@
|
||||
HumHub Changelog
|
||||
================
|
||||
|
||||
1.14.5 (Unreleased)
|
||||
---------------------------
|
||||
- Fix #6596: Fix duplicate error and hint for RichText editor with defined form
|
||||
|
||||
1.14.4 (September 20, 2023)
|
||||
---------------------------
|
||||
- Fix #6489: Never delete original file on store new version
|
||||
|
@ -175,6 +175,7 @@ class AbstractRichTextEditor extends JsInputWidget
|
||||
$inputOptions = $this->getInputAttributes();
|
||||
|
||||
if ($this->form != null) {
|
||||
$this->fieldOptions['template'] = "{label}\n{input}";
|
||||
$input = $this->form->field($this->model, $this->attribute, $this->fieldOptions)->textarea($inputOptions)->label(false);
|
||||
$richText = Html::tag('div', $this->editOutput($this->getValue()), $this->getOptions());
|
||||
$richText = $this->getLabel() . $richText;
|
||||
|
Loading…
x
Reference in New Issue
Block a user