Conf.sql : deleting a group was deleting all groups with the same pre…

…fix!
pydio · Mar 18, 2014 · fd408bb · fd408bb
1 parent a8a434c
commit fd408bb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/core/src/plugins/conf.sql/class.sqlConfDriver.php b/core/src/plugins/conf.sql/class.sqlConfDriver.php
@@ -555,15 +555,14 @@ public function relabelGroup($groupPath, $groupLabel)
     public function deleteGroup($groupPath)
     {
         // Delete users of this group, as well as subgroups
-        $ids = array();
-        $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ ORDER BY [login] ASC", $groupPath);
+        $res = dibi::query("SELECT * FROM [ajxp_users] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s ORDER BY [login] ASC", $groupPath."/", $groupPath);
         $rows = $res->fetchAll();
         $subUsers = array();
         foreach ($rows as $row) {
             $this->deleteUser($row["login"], $subUsers);
             dibi::query("DELETE FROM [ajxp_users] WHERE [login] = %s", $row["login"]);
         }
-        dibi::query("DELETE FROM [ajxp_groups] WHERE [groupPath] LIKE %like~", $groupPath);
+        dibi::query("DELETE FROM [ajxp_groups] WHERE [groupPath] LIKE %like~ OR [groupPath] = %s", $groupPath."/", $groupPath);
         dibi::query('DELETE FROM [ajxp_roles] WHERE [role_id] = %s', 'AJXP_GRP_'.$groupPath);
     }