Ticket #3477: 3477.patch

_source/core/dom/range.js

@@ -257 +257 @@
                         endNode.remove();
         };
 
-        var inlineChildReqElements = { abbr:1,acronym:1,b:1,bdo:1,big:1,cite:1,code:1,del:1,dfn:1,em:1,font:1,i:1,ins:1,label:1,kbd:1,q:1,samp:1,small:1,span:1,strike:1,strong:1,sub:1,sup:1,tt:1,u:1,'var':1 };
 
         // Creates the appropriate node evaluator for the dom walker used inside
         // check(Start|End)OfBlock.
@@ -277 +276 @@
                         {
                                 // If there are non-empty inline elements (e.g. <img />), then we're not
                                 // at the start.
-                                if ( !inlineChildReqElements[ node.getName() ] )
+                                if ( CKEDITOR.dtd.$empty[ node.getName() ] )
                                 {
                                         // If we're working at the end-of-block, forgive the first <br />.
                                         if ( !isStart && node.getName() == 'br' && !hadBr )
@@ -285 +284 @@
                                         else
                                                 return false;
                                 }
+                                else
+                                        return false;
                         }
                 };
         }