From a1bd0747877639b22db0284538619598286d8e7d Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 26 Mar 2014 16:54:09 +0000 Subject: [PATCH] Un-deleting an infolog entry needs a full refresh, not just an update, to remove it from the list of deleted entries --- infolog/inc/class.infolog_ui.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php index d0766b442d..59e0405061 100644 --- a/infolog/inc/class.infolog_ui.inc.php +++ b/infolog/inc/class.infolog_ui.inc.php @@ -1605,16 +1605,17 @@ class infolog_ui } if (($button == 'save' || $button == 'apply') && $info_id) { + $old = $this->bo->read($info_id); if (!($edit_acl = $this->bo->check_access($info_id,EGW_ACL_EDIT))) { - $old = $this->bo->read($info_id); $status_only = $this->bo->is_responsible($old); $undelete = $this->bo->check_access($old,EGW_ACL_UNDELETE); } } if (($button == 'save' || $button == 'apply') && (!$info_id || $edit_acl || $status_only || $undelete)) { - $operation = $info_id ? 'update' : 'add'; + // Most changes we can just update, but un-delete needs an edit + $operation = $info_id ? ($old['info_status'] == 'deleted' ? 'edit' : 'update') : 'add'; if ($content['info_contact']) { $old_link_id = (int)$content['info_link_id'];