mirror_php/humhub
1
0
Fork 0
mirror of https://github.com/humhub/humhub.git synced 2025-01-17 14:18:27 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Lucas Bartholemy 2023-09-25 16:07:21 +02:00
commit 6f5c1485cf
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,10 @@
HumHub Changelog 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) 1.14.4 (September 20, 2023)
--------------------------- ---------------------------
- Fix #6489: Never delete original file on store new version - Fix #6489: Never delete original file on store new version

1
protected/humhub/modules/content/widgets/richtext/AbstractRichTextEditor.php
View File

@ -175,6 +175,7 @@ class AbstractRichTextEditor extends JsInputWidget
$inputOptions = $this->getInputAttributes(); $inputOptions = $this->getInputAttributes();
if ($this->form != null) { if ($this->form != null) {
$this->fieldOptions['template'] = "{label}\n{input}";
$input = $this->form->field($this->model, $this->attribute, $this->fieldOptions)->textarea($inputOptions)->label(false); $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 = Html::tag('div', $this->editOutput($this->getValue()), $this->getOptions());
$richText = $this->getLabel() . $richText; $richText = $this->getLabel() . $richText;