Commit 93308635 authored by Robert Lyon's avatar Robert Lyon Committed by Gerrit Code Review

Merge "Bug 1560780: Allowing 'button' tag in tinymce"

parents e785dd1b a6f2b007
......@@ -318,6 +318,7 @@ tinyMCE.init({
+ ",ul[id|type|compact]"
+ ",iframe[src|width|height|name|scrolling|frameborder|allowfullscreen|webkitallowfullscreen|mozallowfullscreen|longdesc|marginheight|marginwidth|align|title|class|type]"
+ ",a[id|class|title|href|name]"
+ ",button[id|class|title]"
,urlconverter_callback : "custom_urlconvert",
language: '{$language}',
directionality: "{$tinymce_langdir}",
......@@ -3751,6 +3752,8 @@ function clean_html($text, $xhtml=false) {
)
);
$area->excludes = array('area' => true);
// Allow button tags
$def->addElement('button', 'Inline', 'Inline', 'Common');
}
$purifier = new HTMLPurifier($config);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment