Parcourir la source

Fixed trash restore buig

Toby Chui il y a 3 ans
Parent
commit
3d9b01fae1
1 fichiers modifiés avec 3 ajouts et 1 suppressions
  1. 3 1
      file_system.go

+ 3 - 1
file_system.go

@@ -1015,7 +1015,9 @@ func system_fs_restoreFile(w http.ResponseWriter, r *http.Request) {
 	}
 
 	//OK to proceed.
-	targetPath := filepath.ToSlash(filepath.Join(filepath.Dir(filepath.Dir(realpath)), strings.TrimSuffix(filepath.Base(realpath), filepath.Ext(filepath.Base(realpath)))))
+	originalFilename := strings.TrimSuffix(filepath.Base(realpath), filepath.Ext(filepath.Base(realpath)))
+	restoreFolderRoot := filepath.Dir(filepath.Dir(filepath.Dir(realpath)))
+	targetPath := filepath.ToSlash(filepath.Join(restoreFolderRoot, originalFilename))
 	//log.Println(targetPath)
 	os.Rename(realpath, targetPath)