extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-28 01:29:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid conflict between date sub-placeholder for date/time custom field (#date_cf/date) and link-to custom field sub-placeholders (#infolog/created)

Browse Source
This commit is contained in:
Nathan Gray 2012-07-31 17:56:57 +00:00
parent 37992d0ee4
commit 1f94427cf7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1189,7 +1189,7 @@ abstract class bo_merge
foreach($cf as $index => $field) foreach($cf as $index => $field)
{ {
if($cfs[$field]) if($cfs[$field] && in_array($cfs[$field]['type'],$GLOBALS['egw_info']['apps']) )
{ {
// Get replacements for that application // Get replacements for that application
$field_app = $cfs[$field]['type']; $field_app = $cfs[$field]['type'];