diff MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/cfm/cf_upload.cfm @ 5144:12d27670e274

merged moin/1.8
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 14 Sep 2009 02:47:11 +0200
parents wiki/htdocs/applets/FCKeditor/editor/filemanager/connectors/cfm/cf_upload.cfm@287faf79876f wiki/htdocs/applets/FCKeditor/editor/filemanager/connectors/cfm/cf_upload.cfm@a6461afbc0ce
children 9c27b8589342
line wrap: on
line diff
--- a/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/cfm/cf_upload.cfm	Mon Sep 14 01:59:33 2009 +0200
+++ b/MoinMoin/web/static/htdocs/applets/FCKeditor/editor/filemanager/connectors/cfm/cf_upload.cfm	Mon Sep 14 02:47:11 2009 +0200
@@ -24,7 +24,6 @@
 --->
 
 <cfparam name="url.type" default="File">
-<cfparam name="url.currentFolder" default="/">
 
 <!--- note: no serverPath url parameter - see config.cfm if you need to set the serverPath manually --->
 
@@ -36,7 +35,7 @@
 <cffunction name="SendError" returntype="void" output="true">
 	<cfargument name="number" required="true" type="Numeric">
 	<cfargument name="text" required="true">
-	<cfreturn SendUploadResults( "#ARGUMENTS.number#", "", "", "ARGUMENTS.text" )>
+	<cfreturn SendUploadResults( "#ARGUMENTS.number#", "", "", "#ARGUMENTS.text#" )>
 </cffunction>
 
 <cfset REQUEST.Config = Config>
@@ -57,7 +56,7 @@
 	<cfset sType = URL.Type>
 </cfif>
 
-<cfset sCurrentFolder = GetCurrentFolder()>
+<cfset sCurrentFolder = "/">
 
 <!--- Is enabled the upload? --->
 <cfif not IsAllowedCommand( sCommand )>