X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-plugins%2Fgoto%2Fpersonal%2Fenvironment%2Fmain.inc;h=141322066148ee80012083c48efa0193f090d53d;hb=2fad372fadd10bf7636516af03bcac2e3db0c81f;hp=0b0e24f3f1860c15fb83046332771c2527cf5e0c;hpb=635fdfa5d265e37745562f4ae2a6898c3cc67f04;p=gosa.git

diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 0b0e24f3f..141322066 100644
--- a/gosa-plugins/goto/personal/environment/main.inc
+++ b/gosa-plugins/goto/personal/environment/main.inc
@@ -21,7 +21,7 @@
 /* Remove locks created by this plugin
 */
 $lock_msg="";
-if ($remove_lock){
+if ($remove_lock || isset($_POST['edit_cancel'])){
   if(session::is_set('environment') && session::is_set('edit')){
     del_lock($ui->dn);
   }
@@ -36,14 +36,7 @@ if ( $cleanup ){
 }else{
 
   /* Reset requested? */
-  if (isset($_POST['edit_cancel']) || 
-      (isset($_GET['reset']) && $_GET['reset'] == 1)){
-
-    /* Only remove lock if object was opened 
-     */
-    if(session::is_set('environment') && session::is_set('edit')){
-      del_lock ($ui->dn);
-    }
+  if (isset($_POST['edit_cancel'])){
     session::un_set ('edit');
     session::un_set ('environment');
   }