Index: branches/5.3.x/core/units/images/image_tag_processor.php =================================================================== diff -u -N -r16395 -r16519 --- branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 16395) +++ branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 16519) @@ -1,6 +1,6 @@ getUnitConfig()->getParentPrefix(); + /** @var kDBItem $parent_item */ $parent_item = $this->Application->recallObject($parent_prefix); - /* @var $parent_item kDBItem */ $block_params['img_path'] = $image_url; $image_dimensions = $this->ImageSize($block_params); @@ -88,11 +88,11 @@ function LoadItemImage($params) { + /** @var kCatDBItem $parent_item */ $parent_item = $this->Application->recallObject($params['PrefixSpecial']); - /* @var $parent_item kCatDBItem */ + /** @var kDBItem $object */ $object = $this->Application->recallObject($this->getPrefixSpecial(), null, Array('skip_autoload' => true)); - /* @var $object kDBItem */ $object->Clear(); @@ -221,8 +221,8 @@ function ImageSrc($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $this->makeRelativePaths($object); @@ -247,8 +247,8 @@ list ($max_width, $max_height) = $this->_transformParams($params, $max_width, $max_height); if ($object->isLoaded() && file_exists($src_image)) { + /** @var ImageHelper $image_helper */ $image_helper = $this->Application->recallObject('ImageHelper'); - /* @var $image_helper ImageHelper */ return $image_helper->ResizeImage($src_image, $max_width, $max_height); } @@ -287,8 +287,8 @@ return false; } + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ $dst_image = $file_helper->urlToPath($src_image); @@ -297,8 +297,8 @@ function _getImageUrl($params) { + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $base_url = rtrim($this->Application->BaseURL(), '/'); @@ -375,8 +375,8 @@ $sub_folder = $this->Application->isAdmin ? rtrim(IMAGES_PATH, '/') : THEMES_PATH; if (($max_width !== false) || ($max_height !== false)) { + /** @var ImageHelper $image_helper */ $image_helper = $this->Application->recallObject('ImageHelper'); - /* @var $image_helper ImageHelper */ $src_image = FULL_PATH . $sub_folder . '/' . $default_image; @@ -394,8 +394,8 @@ // absolute url if (preg_match('/^(.*):\/\/(.*)$/U', $path)) { + /** @var FileHelper $file_helper */ $file_helper = $this->Application->recallObject('FileHelper'); - /* @var $file_helper FileHelper */ return $file_helper->urlToPath($path); } @@ -418,8 +418,8 @@ { $img_path = $this->getFullPath($params['img_path']); + /** @var ImageHelper $image_helper */ $image_helper = $this->Application->recallObject('ImageHelper'); - /* @var $image_helper ImageHelper */ $max_width = $this->getImageDimension('Width', $params); $max_height = $this->getImageDimension('Height', $params); @@ -447,8 +447,8 @@ return ''; } + /** @var kDBItem $object */ $object = $this->getObject($params); - /* @var $object kDBItem */ $params['img_path'] = $image_url; $image_dimensions = $this->ImageSize($params);