mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 11:19:55 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge f362261b1f into 3b951a0e37

Browse source
This commit is contained in:
Ben Becker 2025-04-22 15:51:49 +02:00 • committed by GitHub
commit 9c113fff4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 34 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

61
admin/include/functions_metadata.php
View file

@ -188,37 +188,44 @@ function get_sync_metadata($infos)
$file = original_to_representative($file, $infos['representative_ext']);
}
if (function_exists('mime_content_type') && in_array(mime_content_type($file), array('image/svg+xml', 'image/svg')))
if (function_exists('mime_content_type'))
{
$xml = file_get_contents($file);
$mime_type = mime_content_type($file);
$xmlget = simplexml_load_string($xml);
$xmlattributes = $xmlget->attributes();
$width = $xmlattributes->width;
$height = $xmlattributes->height;
$vb = (string) $xmlattributes->viewBox;
if (str_starts_with($mime_type, 'image/'))
{
if (in_array($mime_type, array('image/svg+xml', 'image/svg')))
{
$xml = file_get_contents($file);
if (isset($width) and $width != "")
{
$infos['width'] = (int) $width;
} elseif (isset($vb))
{
$infos['width'] = round(explode(" ", $vb)[2]);
$xmlget = simplexml_load_string($xml);
$xmlattributes = $xmlget->attributes();
$width = $xmlattributes->width;
$height = $xmlattributes->height;
$vb = (string) $xmlattributes->viewBox;
if (isset($width) and $width != "")
{
$infos['width'] = (int) $width;
} elseif (isset($vb))
{
$infos['width'] = round(explode(" ", $vb)[2]);
}
if (isset($height) and $height != "")
{
$infos['height'] = (int) $height;
} elseif (isset($vb))
{
$infos['height'] = round(explode(" ", $vb)[3]);
}
}
if ($image_size = @getimagesize($file))
{
$infos['width'] = $image_size[0];
$infos['height'] = $image_size[1];
}
}
if (isset($height) and $height != "")
{
$infos['height'] = (int) $height;
} elseif (isset($vb))
{
$infos['height'] = round(explode(" ", $vb)[3]);
}
}
if ($image_size = @getimagesize($file))
{
$infos['width'] = $image_size[0];
$infos['height'] = $image_size[1];
}
if ($is_tiff)