1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-13 18:14:26 +02:00

Fix for srcSet sizing. Voux theme alignment fixes.

This commit is contained in:
Cameron
2016-12-23 08:53:47 -08:00
parent caffecd9f5
commit 4bfe84b253
3 changed files with 11 additions and 5 deletions

View File

@@ -2564,14 +2564,18 @@ class e_parse extends e_parser
return $this->thumbUrl($src, $parm)." h".$parm['h']." ".$multiply;
}
$width = (!empty($parm['w'])) ? ($parm['w'] * $multiply) : ($this->thumbWidth * $multiply);
$height = (!empty($parm['h'])) ? ($parm['h'] * $multiply) : ($this->thumbHeight * $multiply);
$width = (!empty($parm['w']) || !empty($parm['h'])) ? (intval($parm['w']) * $multiply) : ($this->thumbWidth * $multiply);
$height = (!empty($parm['h']) || !empty($parm['w'])) ? (intval($parm['h']) * $multiply) : ($this->thumbHeight * $multiply);
}
else
{
$height = (($this->thumbHeight * $width) / $this->thumbWidth);
}
if(!isset($parm['aw']))
{
$parm['aw'] = null;
@@ -2598,6 +2602,8 @@ class e_parse extends e_parser
// $parms['x'] = $encode;
if(!empty($parm['return']) && $parm['return'] == 'src')
{
return $this->thumbUrl($src, $parms);