Changeset 5852

Timestamp:

08/30/10 15:38:07 (3 years ago)

Author:

kaga

Message:

Fixed - Duplicate File Renaming Bug

Location:

FCKeditor.Net/trunk

Files:

• AssemblyInfo.cs (modified) (2 diffs)
• FileBrowser/FileWorkerBase.cs (modified) (2 diffs)
• _whatsnew.html (modified) (1 diff)

FCKeditor.Net/trunk/AssemblyInfo.cs

@@ -40 +40 @@
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FCKeditor.FCKeditorV2")]
-[assembly: AssemblyCopyright("2003-2008 Frederico Caldeira Knabben")]
+[assembly: AssemblyCopyright("2003-2010, CKSource - Frederico Knabben")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
@@ -55 +55 @@
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("2.6.3.*")]
+[assembly: AssemblyVersion("2.6.4.*")]
 
 //

FCKeditor.Net/trunk/FileBrowser/FileWorkerBase.cs

@@ -69 +69 @@
                         int iCounter = 0;
 
+                        string orginalNameWithoutExt = System.IO.Path.GetFileNameWithoutExtension(sFileName);
                         while ( true )
                         {
-                                string sFilePath = System.IO.Path.Combine( sServerDir, sFileName );
+                string sFilePath = System.IO.Path.Combine( sServerDir, sFileName );
 
                                 if ( System.IO.File.Exists( sFilePath ) )
@@ -77 +78 @@
                                         iCounter++;
                                         sFileName =
-                                                System.IO.Path.GetFileNameWithoutExtension( oFile.FileName ) +
+                                                orginalNameWithoutExt +
                                                 "(" + iCounter + ")." +
                                                 sExtension;

FCKeditor.Net/trunk/_whatsnew.html

@@ -35 +35 @@
         <h3>
                 SVN</h3>
+        <ul><li></li></ul>
+        <h3>
+                Version 2.6.4</h3>
+                <li><strong>Security release, upgrade is highly recommended</strong>.</li>
+                
         <p>
                 Fixed Bugs:</p>