diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc
index 0b0e24f3f1860c15fb83046332771c2527cf5e0c..141322066148ee80012083c48efa0193f090d53d 100644 (file)
/* Remove locks created by this plugin
*/
$lock_msg="";
/* 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);
}
if(session::is_set('environment') && session::is_set('edit')){
del_lock($ui->dn);
}
}else{
/* Reset requested? */
}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');
}
session::un_set ('edit');
session::un_set ('environment');
}