Merge branch 'ent-8552-fallo-subida-pspz-y-pspz2' into 'develop'
Ent 8552 fallo subida pspz y pspz2 See merge request artica/pandorafms!4684
This commit is contained in:
commit
3f5b9a21f9
|
@ -152,7 +152,7 @@ if ($error === null) {
|
||||||
$error = __('Cannot load INI file');
|
$error = __('Cannot load INI file');
|
||||||
} else {
|
} else {
|
||||||
// Relocate files to target destination.
|
// Relocate files to target destination.
|
||||||
Files::move($tmp_path.'/*', $basepath.'/', true);
|
Files::move($tmp_path.'/', $basepath.'/', true);
|
||||||
|
|
||||||
// Extract information.
|
// Extract information.
|
||||||
$version = preg_replace('/.*[.]/', '', $filename);
|
$version = preg_replace('/.*[.]/', '', $filename);
|
||||||
|
|
|
@ -343,8 +343,13 @@ class Files
|
||||||
}
|
}
|
||||||
|
|
||||||
// If we copied this successfully, mark it for deletion.
|
// If we copied this successfully, mark it for deletion.
|
||||||
rename($source.$file, $destination.$file);
|
$return = rename($source.$file, $destination.$file);
|
||||||
|
if ($return === false) {
|
||||||
|
return $return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return $return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue