From 6917d3da35e655b662ea6190b461e821492fd255 Mon Sep 17 00:00:00 2001 From: "Matt@MBP13-PC" Date: Tue, 17 Jul 2012 08:37:55 -0100 Subject: [PATCH] Merging changes from PeterD/fix25892 --- src/umbraco.presentation/config/tinyMceConfig.Release.config | 2 +- src/umbraco.presentation/config/tinyMceConfig.config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/umbraco.presentation/config/tinyMceConfig.Release.config b/src/umbraco.presentation/config/tinyMceConfig.Release.config index 75ec2dc971..b7438366a5 100644 --- a/src/umbraco.presentation/config/tinyMceConfig.Release.config +++ b/src/umbraco.presentation/config/tinyMceConfig.Release.config @@ -223,7 +223,7 @@ ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|o img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel], -sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor], -tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class], -thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], +thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style], -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], -h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style], diff --git a/src/umbraco.presentation/config/tinyMceConfig.config b/src/umbraco.presentation/config/tinyMceConfig.config index ed701a33d7..78716ed50b 100644 --- a/src/umbraco.presentation/config/tinyMceConfig.config +++ b/src/umbraco.presentation/config/tinyMceConfig.config @@ -228,7 +228,7 @@ ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|o img[id|dir|lang|longdesc|usemap|style|class|src|onmouseover|onmouseout|border|alt=|title|hspace|vspace|width|height|align|umbracoorgwidth|umbracoorgheight|onresize|onresizestart|onresizeend|rel], -sub[style|class],-sup[style|class],-blockquote[dir|style],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|style|dir|id|lang|bgcolor|background|bordercolor], -tr[id|lang|dir|class|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor],tbody[id|class], -thead[id|class],tfoot[id|class],-td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], +thead[id|class],tfoot[id|class],#td[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|bgcolor|background|bordercolor|scope], -th[id|lang|dir|class|colspan|rowspan|width|height|align|valign|style|scope],caption[id|lang|dir|class|style],-div[id|dir|class|align|style], -span[class|align|style],-pre[class|align|style],address[class|align|style],-h1[id|dir|class|align],-h2[id|dir|class|align], -h3[id|dir|class|align],-h4[id|dir|class|align],-h5[id|dir|class|align],-h6[id|style|dir|class|align],hr[class|style],