Index: branches/RC/core/units/general/helpers/image_helper.php
===================================================================
diff -u -N -r11937 -r11938
--- branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 11937)
+++ branches/RC/core/units/general/helpers/image_helper.php	(.../image_helper.php)	(revision 11938)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: image_helper.php 11937 2009-07-20 14:19:13Z alex $
+* @version	$Id: image_helper.php 11938 2009-07-20 14:44:47Z alex $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -176,10 +176,14 @@
 						if (array_key_exists('fill', $params)) {
 							// 3. apply fill
 							$dst_image_rs =& $this->_applyFill($dst_image_rs, $params);
-						}
 
-						// 4. apply watermark
-						$dst_image_rs =& $this->_applyWatermark($dst_image_rs, $params['target_width'], $params['target_height'], $params);
+							// 4. apply watermark
+							$dst_image_rs =& $this->_applyWatermark($dst_image_rs, $params['max_width'], $params['max_height'], $params);
+						}
+						else {
+							// 4. apply watermark
+							$dst_image_rs =& $this->_applyWatermark($dst_image_rs, $params['target_width'], $params['target_height'], $params);
+						}
 					}
 
 					return @$write_function($dst_image_rs, $params['dst_image'], 100);