Ticket #3869: 3869_2.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -248 +248 @@
                 {
                         data = data.replace( regexes[i], function( match )
                                 {
+                                        match = match.replace( /<\!--{(.*?)}(.*?)-->/g,         // There could be protected source inside another one. (#3869).
+                                                function( a, marker, comment )
+                                                {
+                                                        return ( "{" + marker + "}" == protectedSourceMarker ) ? 
+                                                                        decodeURIComponent( comment )
+                                                                :
+                                                                        comment;
+                                                }
+                                        );
                                         return '<!--' + protectedSourceMarker + encodeURIComponent( match ).replace( /--/g, '%2D%2D' ) + '-->';
                                 });
                 }

_source/tests/plugins/htmldataprocessor/htmldataprocessor.html

@@ -270 +270 @@
                                 dataProcessor.toDataFormat( protectedHtml ) );
                 },
 
+                test_ticket_3869_1 : function()
+                {
+                        var editor = CKEDITOR.instances.editor1,
+                                dataProcessor = editor.dataProcessor;
+ 
+                        dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
+                        var html = getTextAreaValue( '_TEXTAREA_3869_1' );
+                        var protectedHtml = dataProcessor.toHtml( html );
+
+                        assert.areSame( html , dataProcessor.toDataFormat( protectedHtml ) );
+                },
+
+                test_ticket_3869_2 : function()
+                {
+                        var editor = CKEDITOR.instances.editor1,
+                                dataProcessor = editor.dataProcessor,
+                                config = editor.config;
+
+                        config.protectedSource.push( /<\?[\s\S]*?\?>/g );   // PHP Code
+                        config.protectedSource.push( /<%[\s\S]*?%>/g );   // ASP Code
+                        config.protectedSource.push( /(<asp:[^\>]+>[\s|\S]*?<\/asp:[^\>]+>)|(<asp:[^\>]+\/>)/gi );   // ASP.Net Code
+                        config.protectedSource.push(/<gallery[\s\S]*?<\/gallery>/gi );  // custom protected source
+                        config.protectedSource.push(/<options[\s\S]*?<\/options>/gi );
+                        dataProcessor.writer = new CKEDITOR.htmlParser.basicWriter();
+                        var html = getTextAreaValue( '_TEXTAREA_3869_2' );
+                        var protectedHtml = dataProcessor.toHtml( html );
+
+                        assert.areSame( html , dataProcessor.toDataFormat( protectedHtml ) );
+                },
+
                 /**
                  * Test empty value attributes.
                  */
@@ -301 +331 @@
 include ("head.html"); ?></td></tr></tbody></table><noscript>Your browser doesn't support JavaScript</noscript></textarea>
         <textarea id="_TEXTAREA_3591"><object><param /><param /><embed></embed></object></textarea>
         <textarea id="_TEXTAREA_3591_protected"><cke:object><cke:param></cke:param><cke:param></cke:param><cke:embed></cke:embed></cke:object></textarea>
+        <textarea id="_TEXTAREA_3869_1">#3869<script language="Javascript" type="text/javascript">
+        <!--
+                alert('-->')
+        //-->
+        </script></textarea>
+        <textarea id="_TEXTAREA_3869_2">#3869<gallery>
+        file.jpg
+        <options name="test1" value="value1"></options>
+        <options name="test2" value="value2"></options>
+        </gallery><?
+                echo '<script type="text/javascript">';
+                echo '<!--alert("-->");//-->';
+                echo '</script>';
+        ?><!--<%Response.Write(now())%>//--><!-- <script language="Javascript" type="text/javascript"></script> --></textarea>
         <textarea id="_TEXTAREA_3591_2"><object classid="clsid"><param name="movie" value="movie.swf" /><embed src="movie.swf" type="application/x-shockwave-flash"></embed></object></textarea>
 </body>
 </html>

CHANGES.html

@@ -44 +44 @@
         <p>
                 Fixed issues:</p>
         <ul>
+                <li><a href="http://dev.fckeditor.net/ticket/3869">#3869</a> : Now it is possible to insert protected source inside another one</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3859">#3859</a> : Fixed Flash dialog layout in Webkit</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3852">#3852</a> : Disabled textarea resizing in dialogs</li>
                 <li><a href="http://dev.fckeditor.net/ticket/3781">#3781</a> : Colorbutton is now disabled in 'source' mode</li>