holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix history logging of removed links when removing by link_id - need to read values before they are deleted

Browse Source
This commit is contained in:
Nathan Gray 2012-06-05 16:44:48 +00:00
parent 9846011ec2
commit 09937c410d
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
phpgwapi/inc/class.egw_link.inc.php
View File

@ -588,13 +588,22 @@ class egw_link extends solink
self::delete_attached($app,$id); // deleting all attachments
self::delete_cache($app,$id);
}
$deleted =& solink::unlink($link_id,$app,$id,$owner,$app2 != '!'.self::VFS_APPNAME ? $app2 : '',$id2,$hold_for_purge);
// Log in history
if(!$app || !$app2)
{
// Need to load it first
$link = self::get_link($link_id);
$app = $link['link_app1'];
$id = $link['link_id1'];
$app2 = $link['link_app2'];
$id2 = $link['link_id2'];
}
historylog::static_add($app,$id,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app2.':'.$id2);
historylog::static_add($app2,$id2,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app.':'.$id);
$deleted =& solink::unlink($link_id,$app,$id,$owner,$app2 != '!'.self::VFS_APPNAME ? $app2 : '',$id2,$hold_for_purge);
// only notify on real links, not the one cached for writing or fileattachments
self::notify_unlink($deleted);