From 55f8b9adc2c79f10bbb9cffca635fa4c16e21a76 Mon Sep 17 00:00:00 2001 From: Matt Pass Date: Fri, 30 Jan 2015 07:22:12 +0000 Subject: [PATCH] Fix to path with | to / replacement --- lib/file-control-xhr.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/file-control-xhr.php b/lib/file-control-xhr.php index 27274f8..44c96c1 100644 --- a/lib/file-control-xhr.php +++ b/lib/file-control-xhr.php @@ -289,7 +289,7 @@ if (!$error && $_GET['action']=="move") { if(rename($srcDir,$tgtDir)) { // Reload file manager $fileOrFolder = is_dir($docRoot.$fileLoc."/".$fileName) ? "folder" : "file"; - $doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'move\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\',false,\''.$fileOrFolder.'\');'; + $doNext .= 'top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'move\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean(str_replace("|","/",$_GET['oldFileName']))).'\',false,\''.$fileOrFolder.'\');'; $finalAction = "move"; $moved=true; // Run our custom processes @@ -439,6 +439,7 @@ if (!$error && $_GET['action']=="upload") { $doNext .= "top.ICEcoder.hideFileMenu();top.document.getElementById('fileInput').value='';top.ICEcoder.showHide('hide',top.document.getElementById('loadingMask'));"; + // Upload is not handled by XHR methods, but form post, so we need to manually trigger $doNext in a script tag echo ""; };