mirror of
https://github.com/friendica/friendica
synced 2024-05-21 19:46:42 +02:00
The dot is now part of the file extension
This commit is contained in:
parent
8d81ff3cdc
commit
70ea9ab2ae
|
@ -150,7 +150,7 @@ class Avatar
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$path = $filename . $size . '.' . $image->getExt();
|
$path = $filename . $size . $image->getExt();
|
||||||
|
|
||||||
$basepath = self::basePath();
|
$basepath = self::basePath();
|
||||||
if (empty($basepath)) {
|
if (empty($basepath)) {
|
||||||
|
|
|
@ -662,9 +662,9 @@ class Photo
|
||||||
|
|
||||||
$suffix = '?ts=' . time();
|
$suffix = '?ts=' . time();
|
||||||
|
|
||||||
$image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4.' . $image->getExt() . $suffix;
|
$image_url = DI::baseUrl() . '/photo/' . $resource_id . '-4' . $image->getExt() . $suffix;
|
||||||
$thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5.' . $image->getExt() . $suffix;
|
$thumb = DI::baseUrl() . '/photo/' . $resource_id . '-5' . $image->getExt() . $suffix;
|
||||||
$micro = DI::baseUrl() . '/photo/' . $resource_id . '-6.' . $image->getExt() . $suffix;
|
$micro = DI::baseUrl() . '/photo/' . $resource_id . '-6' . $image->getExt() . $suffix;
|
||||||
} else {
|
} else {
|
||||||
$photo_failure = true;
|
$photo_failure = true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -213,7 +213,7 @@ class Crop extends BaseSettings
|
||||||
|
|
||||||
DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/photo/crop_head.tpl'), []);
|
DI::page()['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('settings/profile/photo/crop_head.tpl'), []);
|
||||||
|
|
||||||
$filename = $imagecrop['resource-id'] . '-' . $imagecrop['scale'] . '.' . $imagecrop['ext'];
|
$filename = $imagecrop['resource-id'] . '-' . $imagecrop['scale'] . $imagecrop['ext'];
|
||||||
$tpl = Renderer::getMarkupTemplate('settings/profile/photo/crop.tpl');
|
$tpl = Renderer::getMarkupTemplate('settings/profile/photo/crop.tpl');
|
||||||
$o = Renderer::replaceMacros($tpl, [
|
$o = Renderer::replaceMacros($tpl, [
|
||||||
'$filename' => $filename,
|
'$filename' => $filename,
|
||||||
|
|
|
@ -452,7 +452,7 @@ class Images
|
||||||
{
|
{
|
||||||
return self::getBBCodeByUrl(
|
return self::getBBCodeByUrl(
|
||||||
DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
|
DI::baseUrl() . '/photos/' . $nickname . '/image/' . $resource_id,
|
||||||
DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. '.' . $ext,
|
DI::baseUrl() . '/photo/' . $resource_id . '-' . $preview. $ext,
|
||||||
$description
|
$description
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue