Index: branches/5.3.x/core/units/images/image_tag_processor.php =================================================================== diff -u -N -r15902 -r16111 --- branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 15902) +++ branches/5.3.x/core/units/images/image_tag_processor.php (.../image_tag_processor.php) (revision 16111) @@ -1,6 +1,6 @@ SetDBField('Url', $parent_item->GetDBField('FullUrl')); - $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), null, Array('AltName', 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath')); + $object->SetDBFieldsFromHash($parent_item->GetFieldValues(), Array('AltName', 'SameImages', 'LocalThumb', 'ThumbPath', 'ThumbUrl', 'LocalImage', 'LocalPath')); if (!$object->GetDBField('AltName')) { $object->SetDBField('AltName', $this->getItemTitle($parent_item)); @@ -330,7 +330,7 @@ $crop = $this->SelectParam($params, 'Crop,crop'); if ($crop) { - if (strpos($crop, ';') === false) { + if (strpos($crop, '|') === false) { $crop = 'c|c'; } @@ -401,7 +401,7 @@ // TODO: change to urlToPath usage later // relative url (we add sort of does - return FULL_PATH . '/' . mb_substr(THEMES_PATH, 1) . '/' . rawurldecode($path); + return FULL_PATH . '/' . mb_substr(THEMES_PATH, 1) . '/' . kUtil::unescape($path, kUtil::ESCAPE_URL); } /** @@ -501,4 +501,4 @@ return parent::SaveWarning($params); } -} \ No newline at end of file +}