php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

fix: media upload fails when in subdirectory with default paths

Browse Source 
Use file['realfile'] instead of path guessing based on file['full_file'] to access image on disk, since file['full_file'] is based on the http path
This commit is contained in:
onli
2021-05-13 14:18:31 +02:00
parent 05c3fa71eb
commit c00ed46789
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions_images.inc.php
+2 -3
View File
@@ -3168,9 +3168,10 @@ function serendipity_prepareMedia(&$file, $url = '') {
$file['diskname'] = $file['name'] . (empty($file['extension']) ? '' : '.' . $file['extension']);
$file['links'] = array('imagelinkurl' => $file['full_file']);
$file['realfile'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (empty($file['extension']) ? '' : '.' . $file['extension']);
$file['dim'] = @getimagesize($file['full_thumb'], $file['thumb_header']);
$file['dim_orig'] = @getimagesize($serendipity['serendipityPath'] . $file['full_file'], $file['header']);
$file['dim_orig'] = @getimagesize($file['realfile'], $file['header']);
$file['is_image'] = serendipity_isImage($file);
if ($file['is_image']) {
@@ -3189,8 +3190,6 @@ function serendipity_prepareMedia(&$file, $url = '') {
$file['mediatype'] = 'binary';
}
$file['realfile'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . (empty($file['extension']) ? '' : '.' . $file['extension']);
if ($full_perm || $serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0') {
$file['is_editable'] = true;
} else {