Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 1579)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 1580)
@@ -120,4 +120,9 @@
 		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1815">#1815</a>] PHP integration: removed 
 			closing tag: "?>", so no additional whitespace added when files are included.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1692">#1692</a>] ColdFusion file browser: 
+			it is possible now to define TempDirectory to avoid issues with GetTempdirectory() returning 
+			an empty string.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/1379">#1379</a>] ColdFusion file browser: 
+			resolved issues with OnRequestEnd.cfm breaking the file browser.</li>
 	</ul>
 	<p>
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm	(revision 1579)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/cf_commands.cfm	(revision 1580)
@@ -33,4 +33,5 @@
 	<cfset var sFileExt = "">
 	<cfset var sFileUrl = "">
+	<cfset var sTempDir = "">
 	<cfset var sTempFilePath = "">
 	<cfset var errorNumber = 0>
@@ -39,6 +40,15 @@
 	<cfset var destination = "">
 
-    <cftry>
-        <cffile action="UPLOAD" filefield="NewFile" destination="#GetTempDirectory()#" nameconflict="makeunique" mode="0755" />
+	<cftry>
+		<cfif isDefined( "REQUEST.Config.TempDirectory" )>
+			<cfset sTempDir = REQUEST.Config.TempDirectory>
+		<cfelse>
+			<cfset sTempDir = GetTempDirectory()>
+		</cfif>
+		<cfif NOT DirectoryExists (sTempDir)>
+			<cfthrow message="Invalid temporary directory: #sTempDir#">
+		</cfif>
+
+		<cffile action="UPLOAD" filefield="NewFile" destination="#sTempDir#" nameconflict="makeunique" mode="0755" />
 		<cfset sTempFilePath = CFFILE.ServerDirectory & REQUEST.fs & CFFILE.ServerFile>
 
@@ -93,10 +103,5 @@
 
  		<cfset destination = sServerDir & sFileName>
-<!---
-		<cfdump var="#sTempFilePath#">
-		<cfoutput ><br /></cfoutput>
-		<cfdump var="#destination#">
-		<cfabort>
- --->
+
 		<cflock name="#destination#" timeout="30" type="Exclusive">
 		<cftry>
@@ -121,5 +126,5 @@
 		</cfcatch>
 
-    </cftry>
+	</cftry>
 
 	<cfset SendUploadResults( errorNumber, sFileUrl, sFileName, customMsg ) >
Index: /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm	(revision 1579)
+++ /FCKeditor/trunk/editor/filemanager/connectors/cfm/config.cfm	(revision 1580)
@@ -62,4 +62,9 @@
 	Config.HtmlExtensions					= "html,htm,xml,xsd,txt,js" ;
 
+	//Due to known issues with GetTempDirectory function, it is
+	//recommended to set this vairiable to a valid directory
+	//instead of using the GetTempDirectory function
+	//(used by MX 6.0 and above)
+	Config.TempDirectory = GetTempDirectory();
 
 //	Configuration settings for each Resource Type