Просмотр исходного кода

#123 - checking for zero width/height

Alex Trofimov 11 лет назад
Родитель
Сommit
c79eaeb413
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      template/scripts/BxBaseFunctions.php

+ 5 - 2
template/scripts/BxBaseFunctions.php

@@ -309,8 +309,11 @@ class BxBaseFunctions extends BxDol implements iBxDolSingleton
         $sAlt = getParam('sys_site_logo_alt') ? getParam('sys_site_logo_alt') : getParam('site_title');
         $sLogo = $sAlt;
 
-        if ($sFileUrl = $this->getMainLogoUrl())
-            $sLogo = '<img style="max-width:' . round(getParam('sys_site_logo_width')/16, 3) . 'rem; max-height:' . round(getParam('sys_site_logo_height')/16, 3) . 'rem" src="' . $sFileUrl . '" id="bx-logo" class="bx-def-margin-sec" alt="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '" />';
+        if ($sFileUrl = $this->getMainLogoUrl()) {
+            $sMaxWidth = getParam('sys_site_logo_width') > 0 ? 'max-width:' . round(getParam('sys_site_logo_width')/16, 3) . 'rem;' : '';
+            $sMaxHeight = getParam('sys_site_logo_height') > 0 ? 'max-height:' . round(getParam('sys_site_logo_height')/16, 3) . 'rem;' : '';
+            $sLogo = '<img style="' . $sMaxWidth . $sMaxHeight . '" src="' . $sFileUrl . '" id="bx-logo" class="bx-def-margin-sec" alt="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '" />';
+        }
 
         return '<a class="bx-def-font-contrasted" href="' . BX_DOL_URL_ROOT . '" title="' . bx_html_attribute($sAlt, BX_ESCAPE_STR_QUOTE) . '">' . $sLogo . '</a>';
     }