diff --git a/themes/bs_bootstrap/bs_bootstrap.theme b/themes/bs_bootstrap/bs_bootstrap.theme index 1606e84..c4b05ca 100644 --- a/themes/bs_bootstrap/bs_bootstrap.theme +++ b/themes/bs_bootstrap/bs_bootstrap.theme @@ -388,16 +388,15 @@ function bs_bootstrap_preprocess_block(&$variables) { if (bs_bootstrap_get_setting('logo_svg_inline')) { $variables['site_logo_svg'] = $svg_content; } - else { - // Get the logo width and height from SVG image. + // For img SVG get the logo width and height from SVG. + elseif (\Drupal::getContainer()->has('bs_lib.svg_tools')) { /** @var \Drupal\bs_lib\SvgTools $svg_tools */ $svg_tools = \Drupal::service('bs_lib.svg_tools'); - $dimensions = $svg_tools->getDimensions($svg_content); - if (isset($dimensions['width'])) { - $logo_attributes['width'] = $dimensions['width']; - } - if (isset($dimensions['height'])) { - $logo_attributes['height'] = $dimensions['height']; + if ($dimensions = $svg_tools->getDimensions($svg_content)) { + if (isset($dimensions['width']) && isset($dimensions['height'])) { + $logo_attributes['width'] = $dimensions['width']; + $logo_attributes['height'] = $dimensions['height']; + } } } }