extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-17 10:51:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

* mergeprint: fix problem with not replaced app-links like #contact/nfn; fix problem with not replaced date only option on date/datetime customfields

Browse Source
This commit is contained in:
Klaus Leithoff 2012-08-23 10:25:27 +00:00
parent 5e1f3ac1cb
commit aecf198508
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.bo_merge.inc.php
View File

@ -447,7 +447,7 @@ abstract class bo_merge
}
return $content;
}
protected function apply_styles (&$content, $mimetype)
{
if ($mimetype == 'application/xml' &&
@ -1122,7 +1122,7 @@ abstract class bo_merge
foreach($cf as $index => $field)
{
if($cfs[$field] && in_array($cfs[$field]['type'],$GLOBALS['egw_info']['apps']) )
if($cfs[$field] && in_array($cfs[$field]['type'],array_keys($GLOBALS['egw_info']['apps'])) )
{
// Get replacements for that application
$field_app = $cfs[$field]['type'];
@ -1137,6 +1137,10 @@ abstract class bo_merge
}
$replacements[$placeholders[$index]] = $app_replacements[$field_app]['$$'.$sub[$index].'$$'];
}
else
{
if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time') $this->date_fields[] = '#'.$field;
}
}
}