mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Additional checks added before creating a watermark. resizeUp option enabled.

Browse Source
This commit is contained in:
Cameron
2014-01-08 03:43:17 -08:00
parent 39664697ae
commit 0fc0a5c876
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
thumb.php
View File

@@ -268,7 +268,7 @@ class e_thumbpage
try
{
$thumb = PhpThumbFactory::create($this->_src_path);
$thumb->setOptions(array('correctPermissions' => true));
$thumb->setOptions(array('correctPermissions' => true, 'resizeUp'=>true));
}
catch (Exception $e)
{
@@ -293,11 +293,11 @@ class e_thumbpage
// Watermark Option - See admin->MediaManager->prefs for details.
if($this->_watermark['activate'] < $options['w']
if(($this->_watermark['activate'] < $options['w']
|| $this->_watermark['activate'] < $options['aw']
|| $this->_watermark['activate'] < $options['h']
|| $this->_watermark['activate'] < $options['ah']
)
) && $this->_watermark['activate'] > 0 && $this->_watermark['font'] !='')
{
$tp = e107::getParser();
$this->_watermark['font'] = $tp->createConstants($this->_watermark['font'], 'mix');