Ticket #2867: 2867.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -9 +9 @@
 
         init : function( editor, pluginPath )
         {
-                editor.dataProcessor = new CKEDITOR.htmlDataProcessor();
+                var dataProcessor = editor.dataProcessor = new CKEDITOR.htmlDataProcessor();
+                
+                dataProcessor.writer.forceSimpleAmpersand = editor.config.forceSimpleAmpersand;
         }
 });
 
@@ -38 +40 @@
                 return writer.getHtml( true );
         }
 };
+
+CKEDITOR.config.forceSimpleAmpersand = false;
+ No newline at end of file

_source/plugins/htmlwriter/plugin.js

@@ -48 +48 @@
          */
         this.lineBreakChars             = '\n';
 
+        this.forceSimpleAmpersand = false;
+
         this._ =
         {
                 output : [],
@@ -144 +146 @@
          */
         attribute : function( attName, attValue )
         {
+                if ( this.forceSimpleAmpersand )
+                        attValue = attValue.replace( /&/, '&' );
+
                 this._.output.push( ' ', attName, '="', attValue, '"' );
         },