composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-18 23:08:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.5'

Browse Source 
# Conflicts:
#	application/utils.inc.php
This commit is contained in:
Pierre Goiffon
2019-01-31 18:43:20 +01:00
parent 505aad1e89 0aab80917a
commit 2bd7a7b5f8
4 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
datamodels/2.x/itop-portal-base/portal/src/forms/objectformmanager.class.inc.php
View File

@@ -1163,7 +1163,7 @@ class ObjectFormManager extends FormManager
}
elseif ($oAttDef->GetEditClass() === 'CustomFields')
{
if (isset($value['template_data']) && $value['template_data'] !== '')
if (!empty($value['template_data']) && !empty($value['user_data']))
{
$this->oObject->Set($sAttCode, $value);
}