Skip to content

Commit 115ac27

Browse files
committed
reworked move code
1 parent 7a830e4 commit 115ac27

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

server/lib/classes/system.inc.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -936,15 +936,14 @@ function copy($file1, $file2) {
936936

937937
function move($file1, $file2) {
938938
if(file_exists($file1) || is_link($file1)) {
939-
return copy($file1, $file2);
940-
if(file_exists($file2) || is_link($file2)) {
939+
if(copy($file1, $file2)) {
941940
return unlink($file1);
942941
} else {
943942
$app->log("move failed: couldn't move file/link " .$file1." to ".$file2, LOGLEVEL_DEBUG);
944943
return false;
945944
}
946945
} else {
947-
$app->log("move failed: " .$file1." doesn't exist.", LOGLEVEL_DEBUG);
946+
$app->log("move failed: source " .$file1." doesn't exist.", LOGLEVEL_DEBUG);
948947
return false;
949948
}
950949
}

0 commit comments

Comments
 (0)