Index: branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php4/CommandHandler/FileUpload.php
===================================================================
diff -u -r15042 -r15316
--- branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php4/CommandHandler/FileUpload.php	(.../FileUpload.php)	(revision 15042)
+++ branches/5.2.x/core/ckeditor/ckfinder/core/connector/php/php4/CommandHandler/FileUpload.php	(.../FileUpload.php)	(revision 15316)
@@ -3,7 +3,7 @@
  * CKFinder
  * ========
  * http://ckfinder.com
- * Copyright (C) 2007-2011, CKSource - Frederico Knabben. All rights reserved.
+ * Copyright (C) 2007-2012, CKSource - Frederico Knabben. All rights reserved.
  *
  * The software, this file and its contents are subject to the CKFinder
  * License. Please read the license.txt file before using, installing, copying,
@@ -56,6 +56,9 @@
 
         $sUnsafeFileName = CKFinder_Connector_Utils_FileSystem::convertToFilesystemEncoding(CKFinder_Connector_Utils_Misc::mbBasename($uploadedFile['name']));
         $sFileName = str_replace(array(":", "*", "?", "|", "/"), "_", $sUnsafeFileName);
+        if ($_config->getDisallowUnsafeCharacters()) {
+          $sFileName = str_replace(";", "_", $sFileName);
+        }
         if ($_config->forceAscii()) {
             $sFileName = CKFinder_Connector_Utils_FileSystem::convertToAscii($sFileName);
         }