Index: trunk/kernel/units/images/image_tag_processor.php =================================================================== diff -u -N -r8472 -r8474 --- trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8472) +++ trunk/kernel/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 8474) @@ -31,19 +31,7 @@ function ItemImage($params) { $this->LoadItemImage($params); - $params['img_path'] = $this->ImageSrc($params); - $params['img_size'] = $this->ImageSize($params); - if (!$params['img_size']){ - if (isset($params['DefaultWidth'])) { - $params['img_size'] = ' width="'.getArrayValue($params, 'DefaultWidth').'"'; - } - } - $params['name'] = $this->SelectParam($params, 'render_as,block'); - $object =& $this->getObject($params); - if ( !$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage') ) return false; - - $params['alt'] = htmlspecialchars($object->GetField('AltName')); - return $this->Application->ParseBlock($params); + return $this->Image($params); } function LargeImageExists($params) @@ -200,6 +188,10 @@ $params['alt'] = htmlspecialchars($object->GetField('AltName')); // really used ? $params['name'] = $this->SelectParam($params, 'block,render_as'); + if (!$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage')) { + return false; + } + return $this->Application->ParseBlock($params); }