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

thumbnail fix when w/o extension

Browse Source 
serendipity_getThumbNailPath added an unnecessary dot, breaking thumbnail when using the fullsize image
This commit is contained in:
onli
2013-08-18 23:20:17 +02:00
parent 168cb146ea
commit 6772775696
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/functions_images.inc.php
View File

@ -2172,7 +2172,11 @@ function serendipity_getThumbNailPath($sRelativePath, $sName, $sExtension, $sThu
if (isset($aTempArray['thumbnail_filename'])) {
$sThumbNailPath = $aTempArray['thumbnail_filename'];
} else {
$sThumbNailPath = $sRelativePath . $sName . (!empty($sThumbName) ? '.' . $sThumbName : '') . '.' . $sExtension;
if ($sExtension) {
$sThumbNailPath = $sRelativePath . $sName . (!empty($sThumbName) ? '.' . $sThumbName : '') . '.' . $sExtension;
} else {
$sThumbNailPath = $sRelativePath . $sName . (!empty($sThumbName) ? '.' . $sThumbName : '');
}
}
return $sThumbNailPath;
@ -2692,7 +2696,7 @@ function serendipity_checkPropertyAccess(&$new_media, &$additional, $mode = 'rea
* Prepare a media item for showing
*
* @param array Array of image metadata
* @param string URL for maintenance tasks
* @param string URL for maintenance tasks, set when using the ML for inserting images
* @return bool
*
*/
@ -2705,8 +2709,11 @@ function serendipity_prepareMedia(&$file, $url = '') {
}
$sThumbSource = serendipity_getThumbNailPath($file['path'], $file['name'], $file['extension'], $file['thumbnail_name']);
$file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource;
$file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource;
if (! $file['hotlink']) {
$file['full_thumb'] = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $sThumbSource;
$file['full_thumbHTTP'] = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $sThumbSource;
}
$file['url'] = $url;