Index: branches/5.2.x/core/units/images/image_tag_processor.php =================================================================== diff -u -N -r14585 -r14628 --- branches/5.2.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 14585) +++ branches/5.2.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 14628) @@ -1,6 +1,6 @@ ImageSrc($block_params); - if (!$image_url) { + if ( !$image_url ) { return ; } $parent_prefix = $this->Application->getUnitOption($object->Prefix, 'ParentPrefix'); + $parent_item =& $this->Application->recallObject($parent_prefix); + /* @var $parent_item kDBItem */ $block_params['img_path'] = $image_url; $image_dimensions = $this->ImageSize($block_params); - $block_params['img_size'] = $image_dimensions ? $image_dimensions : ' width="'.$block_params['DefaultWidth'].'"'; - $block_params['alt'] = $object->GetField('AltName')? $object->GetField('AltName') : htmlspecialchars($this->getItemTitle($parent_item)); + $block_params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $block_params['DefaultWidth'] . '"'; + $block_params['alt'] = $object->GetField('AltName') ? $object->GetField('AltName') : htmlspecialchars($this->getItemTitle($parent_item)); $block_params['align'] = array_key_exists('align', $block_params) ? $block_params['align'] : 'left'; } @@ -45,10 +49,12 @@ * * @param kDBItem $object * @return string + * @access protected */ - function getItemTitle(&$object) + protected function getItemTitle(&$object) { $title_field = $this->Application->getUnitOption($object->Prefix, 'TitleField'); + return $object->GetField($title_field); } @@ -425,31 +431,34 @@ * * @param Array $params * @return string + * @access protected */ - function Image($params) + protected function Image($params) { $image_url = $this->ImageSrc($params); - if (!$image_url) { - return ; + + if ( !$image_url ) { + return ''; } $object =& $this->getObject($params); + /* @var $object kDBItem */ + $params['img_path'] = $image_url; $image_dimensions = $this->ImageSize($params); - $params['img_size'] = $image_dimensions ? $image_dimensions : ' width="'.$params['DefaultWidth'].'"'; + $params['img_size'] = $image_dimensions ? $image_dimensions : ' width="' . $params['DefaultWidth'] . '"'; $params['alt'] = htmlspecialchars($object->GetField('AltName')); // really used ? $params['name'] = $this->SelectParam($params, 'block,render_as'); $params['align'] = array_key_exists('align', $params) ? $params['align'] : 'left'; $params['no_editing'] = 1; - if (!$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage')) { - return false; + if ( !$object->isLoaded() && !$this->SelectParam($params, 'default_image,DefaultImage') ) { + return ''; } return $this->Application->ParseBlock($params); } - /** * Returns url for image in case when image source is url (for admin) *