Peter M. Groen / knowledgetree

Commit 0e7f19068db84b50f4b05627aa198533313280bd

Authored by Paul Barrett
2 parents 28ae29a2 fd5af8dc

Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
plugins/ktcore/admin/manageBranding.php
  View file @0e7f190
... ... @@ -545,7 +545,7 @@ class ManageBrandDispatcher extends KTAdminDispatcher {
545 545  
546 546 if (($width > $this->maxLogoWidth) || ($height > $this->maxLogoHeight)) {
547 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 551 // ImageMagick Crop
... ...
templates/ktcore/forms/widgets/imageselect.smarty
  View file @0e7f190
... ... @@ -22,7 +22,7 @@
22 22 //Resetting background:
23 23 jQuery("img[id*='kt_image_select_']").css('border', '10px solid ' + background_color);
24 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 26 {rdelim})
27 27 </script>
28 28  
... ...