Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 5026)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 5027)
@@ -38,5 +38,6 @@
 		New Features and Improvements:</p>
 	<ul>
-		<li></li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/4765">#4765</a>] Fixed
+			potential function name clash in built-in file browser with future versions of ColdFusion.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm	(revision 5026)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm	(revision 5027)
@@ -24,5 +24,5 @@
 --->
 
-<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="">
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_connector.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_connector.cfm	(revision 5026)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_connector.cfm	(revision 5027)
@@ -69,5 +69,5 @@
 	<!--- 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>
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm	(revision 5026)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_upload.cfm	(revision 5027)
@@ -69,3 +69,3 @@
 </cfif>
 
-<cfset FileUpload( sType, sCurrentFolder, sCommand )>
+<cfset FCKeditorFileUpload( sType, sCurrentFolder, sCommand )>