Skip to content

Commit

Permalink
Merge pull request #222 from humhub/fix/220-allow-script-in-html-editor
Browse files Browse the repository at this point in the history
Allow script tags in TinyMCE editor
  • Loading branch information
luke- committed Jun 30, 2022
2 parents f841877 + 3c675f6 commit f1380e3
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 2 deletions.
4 changes: 4 additions & 0 deletions docs/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog
=========

1.6.4 (June 30, 2022)
---------------------
- Fix #220: Allow all HTML tags in TinyMCE editor

1.6.3 (June 29, 2022)
---------------------
- Fix #221: Rendering of TinyMCE on edit richtext element of template
Expand Down
2 changes: 1 addition & 1 deletion module.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"name": "Custom Pages",
"description": "Allows admins to create custom pages (html or markdown) or external links to various navigations (e.g. top navigation, account menu).",
"keywords": ["pages", "custom", "iframe", "markdown", "link", "navigation", "spaces"],
"version": "1.6.3",
"version": "1.6.4",
"homepage": "https://github.com/humhub/custom-pages",
"humhub": {
"minVersion": "1.10"
Expand Down
3 changes: 2 additions & 1 deletion widgets/TinyMce.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ private function initDefaults()
'plugins' => ['code', 'autolink', 'link', 'image', 'lists', 'fullscreen', 'table', 'wordcount'],
'toolbar' => 'undo redo | wrapper blocks | bold italic | alignleft aligncenter alignright alignjustify' . $humhubTriggerToolbar . ' | removeformat | code',
'content_style' => '.img-responsive {display:block;max-width:100%;height:auto}',
'valid_elements' => '*[*]',
'external_plugins' => $external_plugins,
'wrapper' => [
'text' => Yii::t('CustomPagesModule.base', 'Panel'),
'tooltip' => Yii::t('CustomPagesModule.base', 'Wrap this HTML page with white panel'),
]
], $this->clientOptions);
}
}
}

0 comments on commit f1380e3

Please sign in to comment.