eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Super special case where we should copy files instead of mv

Browse Source
This commit is contained in:
Mikael Nordfeldth
2016-03-08 01:59:58 +01:00
parent 3b1181dae6
commit 4360c65ed9
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
classes/File_thumbnail.php
View File

@@ -188,8 +188,9 @@ class File_thumbnail extends Managed_DataObject
// If we have a file in our old thumbnail storage path, move it to the new one // If we have a file in our old thumbnail storage path, move it to the new one
if (file_exists($oldpath) && !file_exists($thumbpath)) { if (file_exists($oldpath) && !file_exists($thumbpath)) {
if ($this->getFilename() === $this->getFile()->filename) { if ($this->getFilename() === $this->getFile()->filename) {
// special case where thumbnail file exactly matches stored File // special case where thumbnail file exactly matches stored File filename
common_debug('File filename and File_thumbnail filename match on '.$this->file_id); common_debug('File filename and File_thumbnail filename match on '.$this->file_id.', copying instead');
copy($oldpath, $thumbpath);
} elseif (!rename($oldpath, $thumbpath)) { } elseif (!rename($oldpath, $thumbpath)) {
common_log(LOG_ERR, 'Could not move thumbnail from '._ve($oldpath).' to '._ve($thumbpath)); common_log(LOG_ERR, 'Could not move thumbnail from '._ve($oldpath).' to '._ve($thumbpath));
throw new ServerException('Could not move thumbnail from old path to new path.'); throw new ServerException('Could not move thumbnail from old path to new path.');