From 47c9db224ca9f453a37d4d412e9c250d9b74f19e Mon Sep 17 00:00:00 2001
From: "garry.yao" <garry.yao@da63caf2-3823-0410-a1e8-d69ccee00dfb>
Date: Wed, 24 Aug 2011 14:49:55 +0000
Subject: [PATCH] #7894: enhanced handling of nested links.

git-svn-id: https://svn.ckeditor.com/CKEditor/trunk@7223 da63caf2-3823-0410-a1e8-d69ccee00dfb
---
 CHANGES.html                        |  1 +
 _source/core/htmlparser/fragment.js | 12 +++++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGES.html b/CHANGES.html
index 6d571eb127..d079b1b1d1 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -69,6 +69,7 @@ <h3>
 		<li><a href="http://dev.ckeditor.com/ticket/7490">#7490</a> : [IE] Block format leaks to the next unselected line when <code>enterMode</code> is set to <code>BR</code>.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/8087">#8087</a> : Indenting list items may add redundant text direction attributes.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6200">#6200</a> : Styling for certain dialog element type that miss focus outline like checkbox.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7894">#7894</a> : Fault tolerance when parsing malformed link.</li>
 		<li>Updated the following language files:<ul>
 			<li><a href="http://dev.ckeditor.com/ticket/8128">#8128</a> : Italian;</li>
 			<li><a href="http://dev.ckeditor.com/ticket/8126">#8126</a>, <a href="http://dev.ckeditor.com/ticket/8256">#8256</a> : Norwegian (Bokmål and Nynorsk);</li>
diff --git a/_source/core/htmlparser/fragment.js b/_source/core/htmlparser/fragment.js
index 2b6c411845..b7157aff63 100644
--- a/_source/core/htmlparser/fragment.js
+++ b/_source/core/htmlparser/fragment.js
@@ -46,6 +46,11 @@ CKEDITOR.htmlParser.fragment = function() {
 	// Dtd of the fragment element, basically it accept anything except for intermediate structure, e.g. orphan <li>.
 	var rootDtd = CKEDITOR.tools.extend( {}, { html:1 }, CKEDITOR.dtd.html, CKEDITOR.dtd.body, CKEDITOR.dtd.head, { style:1,script:1 } );
 
+	function isRemoveEmpty( node ) {
+		// Empty link is to be removed when empty but not anchor. (#7894)
+		return node.name == 'a' && node.attributes.href || CKEDITOR.dtd.$removeEmpty[ node.name ];
+	}
+
 	/**
 	 * Creates a {@link CKEDITOR.htmlParser.fragment} from an HTML string.
 	 * @param {String} fragmentHtml The HTML to be parsed, filling the fragment.
@@ -94,6 +99,11 @@ CKEDITOR.htmlParser.fragment = function() {
 						// to properly process the next entry).
 						pendingInline.splice( i, 1 );
 						i--;
+					} else {
+						// Some element of the same type cannot be nested, flat them,
+						// e.g. <a href="#">foo<a href="#">bar</a></a>. (#7894)
+						if ( pendingName == currentNode.name )
+							addElement( currentNode, currentNode.parent, 1 ), i--;
 					}
 				}
 			}
@@ -179,7 +189,7 @@ CKEDITOR.htmlParser.fragment = function() {
 			element.isOptionalClose = tagName in optionalCloseTags || optionalClose;
 
 			// This is a tag to be removed if empty, so do not add it immediately.
-			if ( CKEDITOR.dtd.$removeEmpty[ tagName ] ) {
+			if ( isRemoveEmpty( element ) ) {
 				pendingInline.push( element );
 				return;
 			} else if ( tagName == 'pre' )