summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsun2008-12-31 14:29:41 (GMT)
committer sun2008-12-31 14:29:41 (GMT)
commitc3bbf69b6146cff22827acca41c05c4ff8db4a41 (patch)
tree4b1254fefa556c65ea5e9af94d98e6b6944921bb
parent8942000ad11ac21a072b0df3f8a7cd557ff1d277 (diff)
#348317 by sun: Fixed TinyMCE's extended_valid_elements for advimage plugin.
-rw-r--r--CHANGELOG.txt3
-rw-r--r--editors/tinymce.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index f3651a2..f885ceb 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -6,7 +6,8 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
-#348317 by sun: Fixed TinyMCE's extended_valid_elements for advlink plugin.
+#348317 by sun: Fixed TinyMCE's extended_valid_elements for advlink/advimage
+ plugin.
#348986 by sun: Added CSS class for toggle link container.
#342864 by davexoxide, sun: Added YUI editor support.
#343217 by sun: Fixed improperly capitalized library script name for nicEdit.
diff --git a/editors/tinymce.inc b/editors/tinymce.inc
index 98eb085..7321404 100644
--- a/editors/tinymce.inc
+++ b/editors/tinymce.inc
@@ -379,7 +379,7 @@ function wysiwyg_tinymce_plugins($editor) {
'advimage' => array(
'path' => $editor['library path'] .'/plugins/advimage',
'extensions' => array('advimage' => t('Advanced image')),
- 'extended_valid_elements' => array('img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name]'),
+ 'extended_valid_elements' => array('img[src|alt|title|align|width|height|hspace|vspace|border|style|class|onmouseover|onmouseout|id|name]'),
'url' => 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',
'internal' => TRUE,
'load' => TRUE,