Ticket #4765: 4765.patch

editor/filemanager/connectors/cfm/cf_commands.cfm

@@ -23 +23 @@
  * in the ColdFusion Connector (MX 6.0 and above).
 --->
 
-<cffunction name="FileUpload" returntype="void" output="true">
+<cffunction name="FCKeditorFileUpload" returntype="void" output="true">
         <cfargument name="resourceType" type="string" required="yes" default="">
         <cfargument name="currentFolder" type="string" required="yes" default="">
         <cfargument name="sCommand" type="string" required="yes" default="">

editor/filemanager/connectors/cfm/cf_connector.cfm

@@ -68 +68 @@
 
         <!--- File Upload doesn't have to Return XML, so it must be intercepted before anything. --->
         <cfif sCommand eq "FileUpload">
-                <cfset FileUpload( sResourceType, sCurrentFolder, sCommand )>
+                <cfset FCKeditorFileUpload( sResourceType, sCurrentFolder, sCommand )>
                 <cfabort>
         </cfif>
 

editor/filemanager/connectors/cfm/cf_upload.cfm

@@ -68 +68 @@
         <cfset SendUploadResults( "1", "", "", "Invalid type specified" ) >
 </cfif>
 
-<cfset FileUpload( sType, sCurrentFolder, sCommand )>
+<cfset FCKeditorFileUpload( sType, sCurrentFolder, sCommand )>