Ticket #4172: 4172_2.patch

_source/plugins/htmldataprocessor/plugin.js

@@ -6 +6 @@
 (function()
 {
         // Regex to scan for   at the end of blocks, which are actually placeholders.
-        var tailNbspRegex = /^[\t\r\n ]* $/;
+        // Safari transforms the   to \xa0. (#4172)
+        var tailNbspRegex = /^[\t\r\n ]*(?: |\xa0)$/;
 
         var protectedSourceMarker = '{cke_protected}';
 

CHANGES.html

@@ -224 +224 @@
                 <li><a href="http://dev.fckeditor.net/ticket/4164">#4164</a> : Now it is possible to paste text 
                         in Source mode even if forcePasteAsPlainText = true.</li>
                 <li><a href="http://dev.fckeditor.net/ticket/4129">#4129</a> : [FF]Unable to remove list with Ctrl-A.</li>
+                <li><a href="http://dev.fckeditor.net/ticket/4172">#4172</a> : [Safari] The trailing 
+                        &lt;br&gt; was not been always added to blank lines ending with &amp;nbsp;.</li>
         </ul>
         <h3>
                 CKEditor 3.0 RC</h3>

_source/tests/plugins/styles/styles.html

@@ -578 +578 @@
                         style.applyToRange( range );
 
                         var result = getInnerHtmlParsed( element );
+
+                        if ( CKEDITOR.env.webkit )
+                                result = result.replace( '\xa0', '&nbsp' );
+
                         assert.areSame( '<p>&nbsp;paragraph1&nbsp; paragraph1<br />paragraph2</p><p>&nbsp;para&nbsp;&nbsp; graph3</p>',
                                          result );
                 },