Fixed ACL editing - closes 576

-User filter was not saved in all cases

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@12793 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/include/class_acl.inc b/gosa-core/include/class_acl.inc
index 4d4a36f80593c7b3cb33c1cbb292eebf382fdaa8..0ddb62128e3098e637558b6bb2a7e029669fa0c6 100644 (file)
--- a/gosa-core/include/class_acl.inc
+++ b/gosa-core/include/class_acl.inc
@@ -370,6 +370,15 @@ class acl extends plugin
       }
     }
 
+    /* Save common values */
+    if($this->acl_is_writeable("")){
+      foreach (array("aclType","aclFilter", "aclObject", "target") as $key){
+        if (isset($_POST[$key])){
+          $this->$key= validate($_POST[$key]);
+        }
+      }
+    }
+
     /* Store ACL in main object? */
     if (isset($_POST['submit_new_acl'])){
       $this->gosaAclEntry[$this->currentIndex]['type']= $this->aclType;
@@ -426,15 +435,6 @@ class acl extends plugin
       }
     }
 
-    /* Save common values */
-    if($this->acl_is_writeable("")){
-      foreach (array("aclType","aclFilter", "aclObject", "target") as $key){
-        if (isset($_POST[$key])){
-          $this->$key= validate($_POST[$key]);
-        }
-      }
-    }
-
     /* Create templating instance */
     $smarty= get_smarty();
     $smarty->assign("acl_readable",$this->acl_is_readable(""));