Prevent renaming ML object into existing file.

When renaming objects in the Media Library,
s9y didn't check if a file with the same
name already exists, resulting in a file
name collision deleting both files from
the database _and_ from disk.

Add a check to avoid that.

An error message would be nice, too, but
that may be added later on.

Tested on s9y-stable test instance.

Signed-off-by: Thomas Hochstein <thh@inter.net>
This commit is contained in:
Thomas Hochstein 2020-03-20 17:50:00 +01:00
parent ed778d7199
commit 1ed4b9e7ec
2 changed files with 7 additions and 0 deletions

View File

@ -1,6 +1,9 @@
Version 2.4-alpha1 ()
------------------------------------------------------------------------
* Fix: Prevent renaming a ML object into an existing file,
resulting in deletion of both from disk and database.
* Fix invalid HTTP referrer error when trying to delete a
trackback from the frontend

View File

@ -2260,6 +2260,10 @@ function serendipity_renameFile($id, $newName, $path = null) {
$imgBase = $serendipity['serendipityPath'] . $serendipity['uploadPath'];
$newPath = "{$imgBase}{$path}{$newName}.{$file['extension']}";
if (file_exists($newPath)) {
return false;
}
rename("{$imgBase}{$file['path']}{$file['realname']}", $newPath);