From 35fa4c85701a7a973e828d081f3c2a4a29bfea75 Mon Sep 17 00:00:00 2001
From: mattpass <matt@helical-levity.com>
Date: Sat, 27 Jun 2020 15:23:20 +0100
Subject: [PATCH] Don't selectFiles=[] on update FM, can move to root

---
 classes/File.php     | 2 +-
 lib/file-control.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/File.php b/classes/File.php
index 928855f..3f57ccb 100644
--- a/classes/File.php
+++ b/classes/File.php
@@ -101,7 +101,7 @@ class File
 
     public function updateFileManager($action, $fileLoc, $fileName, $perms, $oldFile, $uploaded, $fileOrFolder) {
         global $doNext;
-        $doNext .= "ICEcoder.selectedFiles=[]; ICEcoder.updateFileManagerList('" .
+        $doNext .= "ICEcoder.updateFileManagerList('" .
             $action . "', '" .
             $fileLoc . "', '" .
             $fileName . "', '" .
diff --git a/lib/file-control.php b/lib/file-control.php
index cda9841..7e52155 100644
--- a/lib/file-control.php
+++ b/lib/file-control.php
@@ -230,7 +230,7 @@ if (!$error && "move" === $_GET['action']) {
         $srcDir = $docRoot . $iceRoot . str_replace("|", "/", $_GET['oldFileName']);
         $tgtDir = $docRoot . $fileLoc . "/" . $fileName;
     }
-    if ($srcDir != $tgtDir && $fileLoc != "") {
+    if ($srcDir != $tgtDir) {
         if (!$demoMode && (isset($ftpSite) || is_writable($srcDir))) {
             // FTP
             if (isset($ftpSite)) {