Ticket #1853: 1853.patch

_whatsnew.html

@@ -65 +65 @@
                         [<a target="_blank" href="http://dev.fckeditor.net/ticket/1985">#1985</a>] 
                         [<a target="_blank" href="http://dev.fckeditor.net/ticket/1989">#1989</a>] 
                         Fixed XHTML source formatting errors in non-IE browsers.</li>
+                <li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1853">#1853</a>] Setting
+                        ShiftEnterMode to p or div now works correctly when EnterMode is br.</li>
         </ul>
         <h3>
                 Version 2.6 Beta 1</h3>

editor/_source/classes/fckenterkey.js

@@ -404 +404 @@
 
         if ( oSplitInfo )
         {
+                // If both PreviousBlock and NextBlock are null, it means SplitBlock() was unable to split.
+                // Why does that happen? Easy, because there's no block. (See #1853)
+                // So let's format the stuff around the selection first and split again.
+                if ( !oSplitInfo.PreviousBlock && !oSplitInfo.NextBlock )
+                {
+                        FCK.Styles.GetStyle( '_FCK_' + blockTag.toLowerCase() ).ApplyToRange( oRange, true ) ;
+                        oRange.Release( true ) ;
+                        oSplitInfo = oRange.SplitBlock() ;
+                }
+
                 // Get the current blocks.
                 var ePreviousBlock      = oSplitInfo.PreviousBlock ;
                 var eNextBlock          = oSplitInfo.NextBlock ;