From 66ea4071ad0029bd727d0fed2690248c4756b7fc Mon Sep 17 00:00:00 2001 From: hickert Date: Fri, 19 Nov 2010 17:29:30 +0000 Subject: [PATCH] Do not mark added folders as removed, just remove them. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20310 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../groupware/FolderWidget/class_FolderWidget.inc | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc index 886ef33c4..b182d9ae1 100644 --- a/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc +++ b/gosa-plugins/groupware/personal/groupware/FolderWidget/class_FolderWidget.inc @@ -307,8 +307,13 @@ class FolderWidget extends plugin $this->_recursiveRemoveByBase($this->folderList['recursive'], $child['base']); } } - - $arr[$path]['status'] = 'removed'; + + // Remove the the entry instead of setting its status if it was just added. + if($arr[$path]['status'] == "added"){ + unset($arr[$path]) ; + }else{ + $arr[$path]['status'] = 'removed'; + } }elseif(isset($item['children']) && count($item['children'])){ $ret = array_merge($ret, $this->_recursiveRemoveByBase($arr[$path]['children'], $base)); } -- 2.30.2