diff --git a/source/java/org/alfresco/web/ui/common/Utils.java b/source/java/org/alfresco/web/ui/common/Utils.java index 687f9538e1..1b8d254d33 100644 --- a/source/java/org/alfresco/web/ui/common/Utils.java +++ b/source/java/org/alfresco/web/ui/common/Utils.java @@ -98,6 +98,10 @@ public final class Utils extends StringUtils private static final Log logger = LogFactory.getLog(Utils.class); + static + { + tagWhiteList.add("STRIKE"); + } /** * Private constructor */ diff --git a/source/web/jsp/content/create-content-wizard/create-html.jsp b/source/web/jsp/content/create-content-wizard/create-html.jsp index e7e8aac679..d1c302a39b 100644 --- a/source/web/jsp/content/create-content-wizard/create-html.jsp +++ b/source/web/jsp/content/create-content-wizard/create-html.jsp @@ -36,7 +36,9 @@ relative_urls: false, elements : "editor", save_callback : "saveContent", - plugins : "table", + plugins : "table,legacyoutput", + inline_styles : false, + convert_fonts_to_spans : false, theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1_add : "fontselect,fontsizeselect", diff --git a/source/web/jsp/content/edit-html-inline.jsp b/source/web/jsp/content/edit-html-inline.jsp index a76e05c630..286c6c6514 100644 --- a/source/web/jsp/content/edit-html-inline.jsp +++ b/source/web/jsp/content/edit-html-inline.jsp @@ -39,7 +39,9 @@ tinyMCE.init({ relative_urls: false, elements : "editor", save_callback : "saveContent", - plugins : "table", + plugins : "table,legacyoutput", + inline_styles : false, + convert_fonts_to_spans : false, theme_advanced_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_buttons1_add : "fontselect,fontsizeselect",