[svn r21850] FS#2867 - The FCKEditor: Implementing a 2.6.5 SVN patch, ticket #3880 - http://dev.fckeditor.net/ticket/3880 .

documentation/changelog.html

@@ -32,7 +32,7 @@
   <li>A transliteration function has been added. Currently, it is used in uploading files. Files with non-English names get names that contain ASCII letters only, remaining readable in the corresponding language. Rationale: The PHP5 run-time environment does not manage file name encodings, adding such a non-native feature involves too much work. For avoiding character encoding problems, transliteration of file names is the possible solution. (FS#306)</li>
   <li>An internationalization option has been added for improving sorting in arbitrary language. When the <a href="http://php.net/manual/en/book.intl.php" target="_blank">intl</a> php-extension has been installed, various sorting routines exploit it for better sorting. Rationale: The PHP5 run-time environment does not provide native and reliable way for sorting UTF-8 strings. (FS#306)</li>
   <li>The installation sript: The page about system requilements has been updated. Also, at the very beginning, a check has been added whether the <a href="http://php.net/manual/en/book.mbstring.php" target="_blank">mbstring</a> php-extension is installed - see <a href="http://dokeos.com/forum/viewtopic.php?t=29548" target="_blank">the related forum topic</a>. (FS#306)</li>
-  <li>The online editor (FCKEditor 2.6.4): Several known bug-fixes have been implemented, tickets <a href="http://dev.fckeditor.net/ticket/2821" target="_blank">#2821</a>, <a href="http://dev.fckeditor.net/ticket/2856" target="_blank">#2856</a>, <a href="http://dev.fckeditor.net/ticket/2915" target="_blank">#2915</a>, <a href="http://dev.fckeditor.net/ticket/3120" target="_blank">#3120</a>, <a href="http://dev.fckeditor.net/ticket/3181" target="_blank">#3181</a>, <a href="http://dev.fckeditor.net/ticket/3429" target="_blank">#3429</a>, <a href="http://dev.fckeditor.net/ticket/3439" target="_blank">#3439</a>. (FS#2867)</li>
+  <li>The online editor (FCKEditor 2.6.4): Several known bug-fixes have been implemented, tickets <a href="http://dev.fckeditor.net/ticket/2821" target="_blank">#2821</a>, <a href="http://dev.fckeditor.net/ticket/2856" target="_blank">#2856</a>, <a href="http://dev.fckeditor.net/ticket/2915" target="_blank">#2915</a>, <a href="http://dev.fckeditor.net/ticket/3120" target="_blank">#3120</a>, <a href="http://dev.fckeditor.net/ticket/3181" target="_blank">#3181</a>, <a href="http://dev.fckeditor.net/ticket/3429" target="_blank">#3429</a>, <a href="http://dev.fckeditor.net/ticket/3439" target="_blank">#3439</a>, <a href="http://dev.fckeditor.net/ticket/3880" target="_blank">#3880</a>. (FS#2867)</li>
   <li>The online editor: Blocking copy/paste for trainees has been added. The feature is configurable through editing the file .../dokeos/main/inc/lib/fckeditor/myconfig.js . (FS#2867)</li>
   <li>The online editor: Preview tabs have been added to the dialogs for inserting video, flv-video, and YouTube video. (FS#2867)</li>
   <li>The online editor: The "audio" plugin has been activated by default as an implementation of the "Insert audio / Audio properties" dialog. This new plugin is intended to replace the "MP3" plugin. (FS#2867)</li>

main/inc/lib/fckeditor/editor/_source/classes/fckdomrange_ie.js

@@ -77,7 +77,7 @@ FCKDomRange.prototype.Select = function( forceExpand )
 FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 {
 	var bIsCollapsed = this.CheckIsCollapsed() ;
-	var bIsStartMakerAlone ;
+	var bIsStartMarkerAlone ;
 	var dummySpan ;
 
 	// Create marker tags for the start and end boundaries.
@@ -111,7 +111,7 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 	}
 	else
 	{
-		bIsStartMakerAlone = ( forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br' ) && !eStartMarker.nextSibing ;
+		bIsStartMarkerAlone = forceExpand || !eStartMarker.previousSibling || eStartMarker.previousSibling.nodeName.toLowerCase() == 'br';
 
 		// Append a temporary <span>&#65279;</span> before the selection.
 		// This is needed to avoid IE destroying selections inside empty
@@ -122,7 +122,7 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 		dummySpan.innerHTML = '&#65279;' ;	// Zero Width No-Break Space (U+FEFF). See #1359.
 		eStartMarker.parentNode.insertBefore( dummySpan, eStartMarker ) ;
 
-		if ( bIsStartMakerAlone )
+		if ( bIsStartMarkerAlone )
 		{
 			// To expand empty blocks or line spaces after <br>, we need
 			// instead to have any char, which will be later deleted using the
@@ -141,7 +141,7 @@ FCKDomRange.prototype.SelectBookmark = function( bookmark, forceExpand )
 
 	if ( bIsCollapsed )
 	{
-		if ( bIsStartMakerAlone )
+		if ( bIsStartMarkerAlone )
 		{
 			// Move the selection start to include the temporary &#65279;.
 			oIERange.moveStart( 'character', -1 ) ;

main/inc/lib/fckeditor/editor/_source/fckeditorapi.js

@@ -41,7 +41,7 @@ function InitializeAPI()
 		var sScript =
 			'window.FCKeditorAPI = {' +
 				'Version : "2.6.4",' +
-				'VersionBuild : "21629",' +
+				'VersionBuild : "23195",' +
 				'Instances : window.FCKeditorAPI && window.FCKeditorAPI.Instances || {},' +
 
 				'GetInstance : function( name )' +

main/inc/lib/fckeditor/editor/dialog/fck_about.html

@@ -79,7 +79,7 @@ window.onload = function()
 								<span fcklang="DlgAboutVersion">version</span>
 								<br />
 								<b>2.6.4</b><br />
-								Build 21629</td>
+								Build 23195</td>
 						</tr>
 					</table>
 				</td>