Notes.php (tine20-2020.08.3) | : | Notes.php (tine20-2020.08.4) | ||
---|---|---|---|---|
skipping to change at line 526 | skipping to change at line 526 | |||
$return .= ' ' . $translate->_($attribute) . ' (' . $tmpDiff ->getTranslatedDiffText() . ')'; | $return .= ' ' . $translate->_($attribute) . ' (' . $tmpDiff ->getTranslatedDiffText() . ')'; | |||
} else { | } else { | |||
$oldData = $diff->oldData ? $diff->oldData[$attribute] : nul l; | $oldData = $diff->oldData ? $diff->oldData[$attribute] : nul l; | |||
if (isset($recordProperties[$attribute]) && ($oldData || $va lue) && | if (isset($recordProperties[$attribute]) && ($oldData || $va lue) && | |||
isset($recordProperties[$attribute]['config']['contr ollerClassName']) && ($controller = | isset($recordProperties[$attribute]['config']['contr ollerClassName']) && ($controller = | |||
$recordProperties[$attribute]['config']['controllerC lassName']::getInstance()) && | $recordProperties[$attribute]['config']['controllerC lassName']::getInstance()) && | |||
method_exists($controller, 'get')) { | method_exists($controller, 'get')) { | |||
if ($oldData) { | if ($oldData) { | |||
if (is_array($oldData)) $oldData = isset($oldData['i d']) ? $oldData['id'] : ''; | ||||
try { | try { | |||
$oldDataString = $controller->get($oldData, null , false, true)->getTitle(); | $oldDataString = $controller->get($oldData, null , false, true)->getTitle(); | |||
} catch (Tinebase_Exception_NotFound $tenf) { | } catch (Tinebase_Exception_NotFound $tenf) { | |||
$oldDataString = $oldData; | $oldDataString = $oldData; | |||
} catch (Tinebase_Exception_AccessDenied $tead) { | } catch (Tinebase_Exception_AccessDenied $tead) { | |||
$oldDataString = $oldData; | $oldDataString = $oldData; | |||
} | } | |||
} else { | } else { | |||
$oldDataString = ''; | $oldDataString = ''; | |||
} | } | |||
if ($value) { | if ($value) { | |||
if (is_array($value)) $value = isset($value['id']) ? $value['id'] : ''; | ||||
try { | try { | |||
$valueString = $controller->get($value, null, fa lse, true)->getTitle(); | $valueString = $controller->get($value, null, fa lse, true)->getTitle(); | |||
} catch(Tinebase_Exception_NotFound $e) { | } catch(Tinebase_Exception_NotFound $e) { | |||
$valueString = $value; | $valueString = $value; | |||
} | } | |||
} else { | } else { | |||
$valueString = ''; | $valueString = ''; | |||
} | } | |||
} else { | } else { | |||
if (is_array($oldData)) { | if (is_array($oldData)) { | |||
End of changes. 2 change blocks. | ||||
0 lines changed or deleted | 2 lines changed or added |