Pārlūkot izejas kodu

Fixed trash restore buig

Toby Chui 3 gadi atpakaļ
vecāks
revīzija
3d9b01fae1
1 mainītis faili ar 3 papildinājumiem un 1 dzēšanām
  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)