mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-14 02:24:08 +02:00
Code Issues Releases Wiki Activity

e_url detection moved to application.php . Resolved conflicts between older URL scheme and new one when rootnamespace is in use.

Browse Source
This commit is contained in:
Cameron
2017-04-19 13:20:59 -07:00
parent 2dfd20c54b
commit 905fb0208b
4 changed files with 269 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/e_parse_class.php
View File

@@ -2610,6 +2610,8 @@ class e_parse extends e_parser
*/
function thumbSrcSet($src='', $width=null)
{
$multiply = null;
if(is_array($width))
{
$parm = $width;
@@ -2648,8 +2650,8 @@ class e_parse extends e_parser
return $this->thumbUrl($src, $parm)." ".$parm['h']."h ".$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);
$width = (!empty($parm['w']) || !empty($parm['h'])) ? (intval($parm['w']) * $multiply) : (intval($this->thumbWidth) * $multiply);
$height = (!empty($parm['h']) || !empty($parm['w'])) ? (intval($parm['h']) * $multiply) : (intval($this->thumbHeight) * $multiply);
}
else