Index: /CKEditor/branches/versions/3.2.x/CHANGES.html =================================================================== --- /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5120) +++ /CKEditor/branches/versions/3.2.x/CHANGES.html (revision 5121) @@ -54,4 +54,6 @@ Fixed issues:

Index: /CKEditor/branches/versions/3.2.x/_samples/php/advanced.php =================================================================== --- /CKEditor/branches/versions/3.2.x/_samples/php/advanced.php (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_samples/php/advanced.php (revision 5121) @@ -75,4 +75,5 @@ echo $CKEditor->editor("editor2", $initialValue, $config); ?> +

Index: /CKEditor/branches/versions/3.2.x/_samples/php/events.php =================================================================== --- /CKEditor/branches/versions/3.2.x/_samples/php/events.php (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_samples/php/events.php (revision 5121) @@ -112,4 +112,5 @@ $CKEditor->editor("editor2", $initialValue, $config, $events); ?> +

Index: /CKEditor/branches/versions/3.2.x/_samples/ui_languages.html =================================================================== --- /CKEditor/branches/versions/3.2.x/_samples/ui_languages.html (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_samples/ui_languages.html (revision 5121) @@ -36,8 +36,7 @@
-
(You may see strange characters if your system doesn't Index: /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_source/core/dom/range.js (revision 5121) @@ -745,7 +745,5 @@ // Check all necessity of updating the end boundary. - if( collapsed ) - this.collapse( true ); - else if ( this.startContainer.equals( this.endContainer ) ) + if ( this.startContainer.equals( this.endContainer ) ) this.setEnd( nextText, this.endOffset - this.startOffset ); else if ( startContainer.equals( this.endContainer ) ) @@ -756,5 +754,8 @@ if ( collapsed ) + { + this.collapse( true ); return; + } } Index: /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/basicwriter.js (revision 5121) @@ -63,5 +63,5 @@ // Browsers don't always escape quote in attribute values. (#4683) if ( typeof attValue == 'string' ) - attValue = attValue.replace( /"/g, '"' ) + attValue = attValue.replace( /"/g, '"' ); this._.output.push( ' ', attName, '="', attValue, '"' ); Index: /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/fragment.js =================================================================== --- /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/fragment.js (revision 5120) +++ /CKEditor/branches/versions/3.2.x/_source/core/htmlparser/fragment.js (revision 5121) @@ -65,4 +65,5 @@ fragment = new CKEDITOR.htmlParser.fragment(), pendingInline = [], + pendingBRs = [], currentNode = fragment, // Indicate we're inside a 
 element, spaces should be touched differently.
@@ -72,4 +73,6 @@
 		function checkPending( newTagName )
 		{
+			var pendingBRsSent;
+
 			if ( pendingInline.length > 0 )
 			{
@@ -83,4 +86,10 @@
 					if ( ( !currentDtd || currentDtd[ pendingName ] ) && ( !newTagName || !pendingDtd || pendingDtd[ newTagName ] || !CKEDITOR.dtd[ newTagName ] ) )
 					{
+						if ( !pendingBRsSent )
+						{
+							sendPendingBRs();
+							pendingBRsSent = 1;
+						}
+
 						// Get a clone for the pending element.
 						pendingElement = pendingElement.clone();
@@ -98,4 +107,10 @@
 				}
 			}
+		}
+
+		function sendPendingBRs()
+		{
+			while ( pendingBRs.length )
+				currentNode.add( pendingBRs.shift() );
 		}
 
@@ -182,4 +197,10 @@
 			}
 
+			if ( tagName == 'br' )
+			{
+				pendingBRs.push( element );
+				return;
+			}
+
 			var currentName = currentNode.name;
 
@@ -309,6 +330,9 @@
 				currentNode = candidate;
 
-				if( currentNode.name == 'pre' )
+				if ( currentNode.name == 'pre' )
 					inPre = false;
+
+				if ( candidate._.isBlockLike )
+					sendPendingBRs();
 
 				addElement( candidate, candidate.parent );
@@ -322,5 +346,5 @@
 			}
 
-			if( tagName == 'body' )
+			if ( tagName == 'body' )
 				fixForBody = false;
 		};
@@ -337,4 +361,5 @@
 			}
 
+			sendPendingBRs();
 			checkPending();
 
@@ -366,4 +391,6 @@
 		// Parse it.
 		parser.parse( fragmentHtml );
+
+		sendPendingBRs();
 
 		// Close all pending nodes.
Index: /CKEditor/branches/versions/3.2.x/_source/core/loader.js
===================================================================
--- /CKEditor/branches/versions/3.2.x/_source/core/loader.js	(revision 5120)
+++ /CKEditor/branches/versions/3.2.x/_source/core/loader.js	(revision 5121)
@@ -162,6 +162,6 @@
 				// We must guarantee the execution order of the scripts, so we
 				// need to load them one by one. (#4145)
-				// The followin if/else block has been taken from the scriptloader core code.
-				if ( CKEDITOR.env.ie )
+				// The following if/else block has been taken from the scriptloader core code.
+				if ( typeof(script.onreadystatechange) !== "undefined" )
 				{
 					/** @ignore */
@@ -191,5 +191,5 @@
 			/**
 			 * Loads a specific script, including its dependencies. This is not a
-			 * synchronous loading, which means that the code the be loaded will
+			 * synchronous loading, which means that the code to be loaded will
 			 * not necessarily be available after this call.
 			 * @example
@@ -218,5 +218,8 @@
 
 				// Append the