Index: /FCKeditor/trunk/_whatsnew.html
===================================================================
--- /FCKeditor/trunk/_whatsnew.html	(revision 349)
+++ /FCKeditor/trunk/_whatsnew.html	(revision 350)
@@ -142,4 +142,6 @@
 			the target directory is now being automatically created if needed when "quick uploading".
 			Thanks to sirmeili.</li>
+		<li>[<a target="_blank" href="http://dev.fckeditor.net/ticket/295">#295</a>] [<a target="_blank" href="http://dev.fckeditor.net/ticket/510">#510</a>] Corrected some
+			path resolution issues with the File Browser connector for ColdFusion.</li>
 	</ul>
 	<h3>
Index: /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm
===================================================================
--- /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm	(revision 349)
+++ /FCKeditor/trunk/editor/filemanager/browser/default/connectors/cfm/connector.cfm	(revision 350)
@@ -48,4 +48,8 @@
 	lDeniedExtensions = config.deniedExtensions[url.type];
 
+	if ( userFilesPath eq "" ) {
+		userFilesPath = "/userfiles/";
+	}
+
 	// make sure the user files path is correctly formatted
 	userFilesPath = replace(userFilesPath, "\", "/", "ALL");
@@ -75,6 +79,10 @@
 	if ( len(config.serverPath) ) {
 		serverPath = config.serverPath;
+	
+		if ( right(serverPath,1) neq fs ) {
+			serverPath = serverPath & fs;
+		}
 	} else {
-		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"");
+		serverPath = replaceNoCase(getBaseTemplatePath(),replace(cgi.script_name,"/",fs,"all"),"") & replace(userFilesPath,"/",fs,"all");
 	}
 
@@ -361,3 +369,3 @@
 <cfheader name="Cache-Control" value="no-cache, no-store, must-revalidate">
 <cfcontent reset="true" type="text/xml; charset=UTF-8">
-<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>	
+<cfoutput>#xmlHeader##xmlContent##xmlFooter#</cfoutput>