vanilla ckeditor-3.2.1

[ckeditor.git] / _source / core / htmlparser / basicwriter.js

diff --git a/_source/core/htmlparser/basicwriter.js b/_source/core/htmlparser/basicwriter.js
index ecb45f6..3a0231c 100644 (file)
--- a/_source/core/htmlparser/basicwriter.js
+++ b/_source/core/htmlparser/basicwriter.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -60,6 +60,10 @@ CKEDITOR.htmlParser.basicWriter = CKEDITOR.tools.createClass(
                 */\r
                attribute : function( attName, attValue )\r
                {\r
+                       // Browsers don't always escape special character in attribute values. (#4683, #4719).\r
+                       if ( typeof attValue == 'string' )\r
+                               attValue = CKEDITOR.tools.htmlEncodeAttr( attValue );\r
+\r
                        this._.output.push( ' ', attName, '="', attValue, '"' );\r
                },\r
 \r
@@ -117,6 +121,7 @@ CKEDITOR.htmlParser.basicWriter = CKEDITOR.tools.createClass(
                reset : function()\r
                {\r
                        this._.output = [];\r
+                       this._.indent = false;\r
                },\r
 \r
                /**\r