Ticket #2403: userpatch_2403.patch

editor/_source/classes/fckenterkey.js

@@ -483 +483 @@
 
                                 // If is a header tag, or we are in a Shift+Enter (#77),
                                 // create a new block element (later in the code).
-                                if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) )
+                                if ( !this._HasShift && !(/^H[1-6]$/).test( sPreviousBlockTag ) && ( !FCKEditor.ForceEnterMode || sPreviousBlockTag == 'LI' ) ) 
                                 {
                                         // Otherwise, duplicate the previous block.
                                         eNewBlock = FCKDomTools.CloneElement( ePreviousBlock ) ;
                                 }
                         }
-                        else if ( eNextBlock )
+                        else if ( eNextBlock && !FCKEditor.ForceEnterMode )
                                 eNewBlock = FCKDomTools.CloneElement( eNextBlock ) ;
 
                         if ( !eNewBlock )