Ticket #957: 957_2.patch

_whatsnew.html

@@ -145 +145 @@
                         the FCKeditor class is now more PHP5/6 friendly ("public" keyword is used instead
                         of depreciated "var").</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration:
-                        removed closing tag: "?>", so no additional whitespace added when files are included.</li>
+                        removed closing tag: "?&gt;", so no additional whitespace added when files are included.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1906">#1906</a>] PHP file
                         browser: fixed problems with DetectHtml() function when open_basedir was set.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1871">#1871</a>] PHP file
@@ -177 +177 @@
                         settings.</li>
                 <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1868">#1868</a>] Links
                         to file browser has been changed to avoid requests containing double dots.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/957">#957</a>] Pressing Enter 
+                        or typing after a placeholder with the placeholder plugin will no longer generate 
+                        colored text.</li>
         </ul>
         <p>
                 <a href="_whatsnew_history.html">See previous versions history</a>

editor/_source/internals/fck_gecko.js

@@ -104 +104 @@
 
                         // only perform the patched behavior if we're in an <a> tag, or the End key is pressed.
                         var parentTag = node.parentNode.tagName.toLowerCase() ;
-                        if ( ! (  parentTag == 'a' ||
+                        if ( ! (  parentTag == 'a' || String(node.parentNode.contentEditable) == 'false' ||
                                         ( ! ( FCKListsLib.BlockElements[parentTag] || FCKListsLib.NonEmptyBlockElements[parentTag] )
                                           && keyCode == 35 ) ) )
                                 return ;