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

Fixes related to Gallery image import, watermarks and thumbnails.

Browse Source
This commit is contained in:
CaMer0n
2012-07-14 10:40:40 +00:00
parent 8c497fcee1
commit 4cfe5c4387
12 changed files with 133 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_handlers/e_parse_class.php
View File

@@ -1791,7 +1791,9 @@ class e_parse
if($raw) $url = $this->createConstants($url, 'mix');
$thurl = ($full ? SITEURL : e_HTTP).'thumb.php?src='.$url.'&';
$baseurl = ($full ? SITEURL : e_HTTP).'thumb.php?';
$thurl = 'src='.$url.'&';
if(vartrue($options['aw']) || vartrue($options['ah']))
{
@@ -1803,14 +1805,15 @@ class e_parse
$thurl .= 'w='.((integer) vartrue($options['w'], 0)).'&h='.((integer) vartrue($options['h'], 0));
}
if(vartrue($options['wm']))//TODO remove from URL. set session.
if(vartrue($options['x']))//base64 encode url
{
$thurl .= "&wm=".$this->replaceConstants($options['wm'],'abs');
$thurl = 'id='.base64_encode($thurl);
}
// echo "<br /><br />".$thurl;
return $thurl;
return $baseurl.$thurl;
}
/**