Commit 0e7f19068db84b50f4b05627aa198533313280bd
Merge branch 'edge' of github.com:ktgit/knowledgetree into edge
Showing
2 changed files
with
2 additions
and
2 deletions
plugins/ktcore/admin/manageBranding.php
| @@ -545,7 +545,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher { | @@ -545,7 +545,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher { | ||
| 545 | 545 | ||
| 546 | if (($width > $this->maxLogoWidth) || ($height > $this->maxLogoHeight)) { | 546 | if (($width > $this->maxLogoWidth) || ($height > $this->maxLogoHeight)) { |
| 547 | $default->log->info('SCALING IMAGE AFTER CROP'); | 547 | $default->log->info('SCALING IMAGE AFTER CROP'); |
| 548 | - $res = $this->scaleImage($logoFile, $destFile, $this->maxLogoWidth, $this->maxLogoHeight, $type); | 548 | + $res = $this->scaleImage($destFile, $destFile, $this->maxLogoWidth, $this->maxLogoHeight, $type, false, false); |
| 549 | } | 549 | } |
| 550 | 550 | ||
| 551 | // ImageMagick Crop | 551 | // ImageMagick Crop |
templates/ktcore/forms/widgets/imageselect.smarty
| @@ -22,7 +22,7 @@ | @@ -22,7 +22,7 @@ | ||
| 22 | //Resetting background: | 22 | //Resetting background: |
| 23 | jQuery("img[id*='kt_image_select_']").css('border', '10px solid ' + background_color); | 23 | jQuery("img[id*='kt_image_select_']").css('border', '10px solid ' + background_color); |
| 24 | jQuery('#kt_image_select_{$id}').css('border', '10px solid ' + click); | 24 | jQuery('#kt_image_select_{$id}').css('border', '10px solid ' + click); |
| 25 | - window.console.log('#kt_image_select_{$id} = {$src} : toggle_{$id} [' + toggle_{$id} + ']'); | 25 | + |
| 26 | {rdelim}) | 26 | {rdelim}) |
| 27 | </script> | 27 | </script> |
| 28 | 28 |