Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
mahara
mahara
Commits
93308635
Commit
93308635
authored
Nov 10, 2017
by
Robert Lyon
Committed by
Gerrit Code Review
Nov 10, 2017
Browse files
Merge "Bug 1560780: Allowing 'button' tag in tinymce"
parents
e785dd1b
a6f2b007
Changes
1
Hide whitespace changes
Inline
Side-by-side
htdocs/lib/web.php
View file @
93308635
...
@@ -318,6 +318,7 @@ tinyMCE.init({
...
@@ -318,6 +318,7 @@ tinyMCE.init({
+ ",ul[id|type|compact]"
+ ",ul[id|type|compact]"
+ ",iframe[src|width|height|name|scrolling|frameborder|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|longdesc|marginheight|marginwidth|align|title|class|type]"
+ ",iframe[src|width|height|name|scrolling|frameborder|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|longdesc|marginheight|marginwidth|align|title|class|type]"
+ ",a[id|class|title|href|name]"
+ ",a[id|class|title|href|name]"
+ ",button[id|class|title]"
,urlconverter_callback : "custom_urlconvert",
,urlconverter_callback : "custom_urlconvert",
language: '{$language}',
language: '{$language}',
directionality: "{$tinymce_langdir}",
directionality: "{$tinymce_langdir}",
...
@@ -3751,6 +3752,8 @@ function clean_html($text, $xhtml=false) {
...
@@ -3751,6 +3752,8 @@ function clean_html($text, $xhtml=false) {
)
)
);
);
$area
->
excludes
=
array
(
'area'
=>
true
);
$area
->
excludes
=
array
(
'area'
=>
true
);
// Allow button tags
$def
->
addElement
(
'button'
,
'Inline'
,
'Inline'
,
'Common'
);
}
}
$purifier
=
new
HTMLPurifier
(
$config
);
$purifier
=
new
HTMLPurifier
(
$config
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment