Index: branches/5.3.x/core/units/images/image_tag_processor.php =================================================================== diff -u -N -r15677 -r15698 --- branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 15677) +++ branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 15698) @@ -1,6 +1,6 @@ Application->getUnitOption($object->Prefix, 'ParentPrefix'); + $parent_prefix = $object->getUnitConfig()->getParentPrefix(); $parent_item = $this->Application->recallObject($parent_prefix); /* @var $parent_item kDBItem */ @@ -53,7 +53,7 @@ */ protected function getItemTitle(&$object) { - $title_field = $this->Application->getUnitOption($object->Prefix, 'TitleField'); + $title_field = $object->getUnitConfig()->getTitleField(); return $object->GetField($title_field); } @@ -121,8 +121,9 @@ } } else { // if requested image is not primary thumbnail - load it directly - $id_field = $this->Application->getUnitOption($this->Prefix, 'ForeignKey'); - $parent_table_key = $this->Application->getUnitOption($this->Prefix, 'ParentTableKey'); + $config = $this->getUnitConfig(); + $id_field = $config->getForeignKey(); + $parent_table_key = $config->getParentTableKey(); $keys[$id_field] = $parent_item->GetDBField($parent_table_key); @@ -182,7 +183,7 @@ if (!$ret) { return $ret; } - $parent_prefix = $this->Application->getUnitOption($this->Prefix, 'ParentPrefix'); + $parent_prefix = $this->getUnitConfig()->getParentPrefix(); if ($ret == 'thumbnail') { $ret = $this->Application->ConfigValue($parent_prefix.'_ThumbnailImage'.$type);