extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +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:26:43 +00:00
parent 4cd32b9deb
commit 5637674315
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1158,7 +1158,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'];
@ -1173,6 +1173,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;
}
}
}