Merge branch 'pr/2871' into pull-request-2871

* pr/2871:
  Rename _acl_add to _acl_addOrUpdate
  Fix #1115

lib/plugins/acl/admin.php

@@ -115,7 +115,7 @@ public function handle()
             if ($cmd == 'save' && $scope && $this->who && $INPUT->has('acl')) {
                 // handle additions or single modifications
                 $this->deleteACL($scope, $this->who);
-                $this->addACL($scope, $this->who, $INPUT->int('acl'));
+                $this->addOrUpdateACL($scope, $this->who, $INPUT->int('acl'));
             } elseif ($cmd == 'del' && $scope && $this->who) {
                 // handle single deletions
                 $this->deleteACL($scope, $this->who);
@@ -716,9 +716,12 @@ protected function getExactPermisson()
      *
      * @author  Frank Schubert <frank@schokilade.de>
      */
-    public function addACL($acl_scope, $acl_user, $acl_level)
+    public function addOrUpdateACL($acl_scope, $acl_user, $acl_level)
     {
         global $config_cascade;
+
+        // first make sure we won't end up with 2 lines matching this user and scope. See issue #1115
+        $this->deleteACL($acl_scope, $acl_user);
         $acl_user = auth_nameencode($acl_user, true);
 
         // max level for pagenames is edit

lib/plugins/acl/remote.php

@@ -75,7 +75,7 @@ public function addAcl($scope, $user, $level)
 
         /** @var admin_plugin_acl $apa */
         $apa = plugin_load('admin', 'acl');
-        return $apa->addACL($scope, $user, $level);
+        return $apa->addOrUpdateACL($scope, $user, $level);
     }
 
     /**