Index: branches/RC/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r9639 -r9642 --- branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 9639) +++ branches/RC/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 9642) @@ -2059,16 +2059,19 @@ * @param Array $params * @return string */ - /*function ImageSrc($params) + function ImageSrc($params) { $max_width = isset($params['MaxWidth']) ? $params['MaxWidth'] : false; $max_height = isset($params['MaxHeight']) ? $params['MaxHeight'] : false; + $logo_filename = isset($params['LogoFilename']) ? $params['LogoFilename'] : false; + $logo_h_margin = isset($params['LogoHMargin']) ? $params['LogoHMargin'] : false; + $logo_v_margin = isset($params['LogoVMargin']) ? $params['LogoVMargin'] : false; $object =& $this->getObject($params); $field = $this->SelectParam($params, 'name,field'); - return $object->GetField($field, 'resize:'.$max_width.'x'.$max_height); - }*/ + return $object->GetField($field, 'resize:'.$max_width.'x'.$max_height.';wm:'.$logo_filename.'|'.$logo_h_margin.'|'.$logo_v_margin); + } } ?> \ No newline at end of file