adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-08-06 00:33:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

related to #1657 Support svg with no height and width attribute

Browse Source 
If the svg doesn't have height of width attributes, it takes it's dimentions in the viewBox attribute.
This commit is contained in:
Matthieu Leproux
2022-05-09 12:49:13 +02:00
parent 3a79e38919
commit 3743a53edc
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_metadata.php
+4 -5
View File
@@ -191,14 +191,13 @@ function get_sync_metadata($infos)
$xmlget = simplexml_load_string($xml);
$xmlattributes = $xmlget->attributes();
$width = (string) $xmlattributes->width;
$height = (string) $xmlattributes->height;
$width = (int) $xmlattributes->width;
$height = (int) $xmlattributes->height;
$vb = (string) $xmlattributes->viewBox;
$infos['is_svg'] = $is_svg;
if (isset($width))
if (isset($width) and $width != "")
{
$infos['width'] = $width;
} elseif (isset($vb))
@@ -206,7 +205,7 @@ function get_sync_metadata($infos)
$infos['width'] = explode(" ", $vb)[2];
}
if (isset($height))
if (isset($height) and $height != "")
{
$infos['height'] = $height;
} elseif (isset($vb))
themes/default/template/picture_content.tpl
+1 -1
View File
@@ -4,7 +4,7 @@
{footer_script}var error_icon = "{$ROOT_URL}{$themeconf.icon_dir}/errors_small.png"{/footer_script}
{/if}
<img {if $current.is_svg}src="{$current.path}"{elseif $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}"{$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}">
<img {if $current.is_svg}src="{$current.path}" style="{if $current.width < 150}min-width: 200px; {else} max-width:{$current.width}; {/if} {if $current.height < 150} min-height: 200px;{else} max-height: {$current.height} {/if}" {elseif $current.selected_derivative->is_cached()}src="{$current.selected_derivative->get_url()}"{$current.selected_derivative->get_size_htm()}{else}src="{$ROOT_URL}{$themeconf.img_dir}/ajax_loader.gif" data-src="{$current.selected_derivative->get_url()}"{/if} alt="{$ALT_IMG}" id="theMainImage" usemap="#map{$current.selected_derivative->get_type()}" title="{if isset($COMMENT_IMG)}{$COMMENT_IMG|@strip_tags:false|@replace:'"':' '}{else}{$current.TITLE_ESC} - {$ALT_IMG}{/if}">
{foreach from=$current.unique_derivatives item=derivative key=derivative_type}{strip}
<map name="map{$derivative->get_type()}">