From 050128f313fed5ed4decd8c9a2b03f45b72c0c37 Mon Sep 17 00:00:00 2001
From: Graham Knop <graham@plainblack.com>
Date: Fri, 7 Mar 2008 18:55:46 +0000
Subject: [PATCH] fixed: changing image thumbnail size doesn't resize image

---
 docs/changelog/7.x.x.txt       | 1 +
 lib/WebGUI/Asset/File.pm       | 3 +++
 lib/WebGUI/Asset/File/Image.pm | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt
index 521733039..08e79ccc2 100644
--- a/docs/changelog/7.x.x.txt
+++ b/docs/changelog/7.x.x.txt
@@ -3,6 +3,7 @@
  - Internationalized Calendar templates
  - fixed: exporting as HTML leaks sessions for inaccessible assets, 
  - new YUI based date picker
+ - fixed: changing image thumbnail size doesn't resize image
 
 7.5.5
  - fixed: Several typos in the new Calendar help documentation.
diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm
index c27450791..01aa074fd 100644
--- a/lib/WebGUI/Asset/File.pm
+++ b/lib/WebGUI/Asset/File.pm
@@ -334,6 +334,9 @@ sub processPropertiesFromFormPost {
         $self->setFile( $filePath );
         $storage->delete;
     }
+    else {
+        $self->applyConstraints;
+    }
 
     return undef;
 }
diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm
index 55c2d790e..e09b951b8 100644
--- a/lib/WebGUI/Asset/File/Image.pm
+++ b/lib/WebGUI/Asset/File/Image.pm
@@ -66,8 +66,8 @@ sub applyConstraints {
     my $self = shift;
     my $options = shift;
     $self->SUPER::applyConstraints($options);
-    my $maxImageSize = $options->{maxImageSize} || $self->session->setting->get("maxImageSize");
-    my $thumbnailSize = $options->{thumbnailSize} || $self->session->setting->get("thumbnailSize");
+    my $maxImageSize = $options->{maxImageSize} || $self->get('maxImageSize') || $self->session->setting->get("maxImageSize");
+    my $thumbnailSize = $options->{thumbnailSize} || $self->get('thumbnailSize') || $self->session->setting->get("thumbnailSize");
 	my $parameters = $self->get("parameters");
     my $storage = $self->getStorageLocation;
 	unless ($parameters =~ /alt\=/) {