Ticket #3782: 3782.patch

_source/plugins/list/plugin.js

@@ -11 +11 @@
 {
         var listNodeNames = { ol : 1, ul : 1 },
                 emptyTextRegex = /^[\n\r\t ]*$/;
+        var dtd = CKEDITOR.dtd;
+        var blockLikeTags = CKEDITOR.tools.extend( {}, dtd.$block, dtd.$listItem, dtd.$tableContent );
 
         CKEDITOR.plugins.list = {
                 /*
@@ -335 +337 @@
                 }
 
                 var newList = CKEDITOR.plugins.list.arrayToList( listArray, database, null, editor.config.enterMode );
+
                 // If groupObj.root is the last element in its parent, or its nextSibling is a <br>, then we should
                 // not add a <br> after the final item. So, check for the cases and trim the <br>.
                 if ( !groupObj.root.getNext() || groupObj.root.getNext().$.nodeName.toLowerCase() == 'br' )
@@ -342 +345 @@
                         if ( newList.listNode.getLast().$.nodeName.toLowerCase() == 'br' )
                                 newList.listNode.getLast().remove();
                 }
+
+                var parentNode = groupObj.root.getParent();
                 newList.listNode.replace( groupObj.root );
+
+                // If groupObj.root's parent is a block, we might have removed the filler BR node at the line above.
+                // So put it back if needed. (#3782)
+                if ( parentNode && blockLikeTags[ parentNode.getName() ] )
+                        parentNode.appendBogus();
         }
 
         function listCommand( name, type )