Fixes some issues with the ACL queries

2 files changed, 3 insertions, 2 deletions

diff --git a/lib/Db/ShareRequest.php b/lib/Db/ShareRequest.php
index 473ec95d..df7947be 100644
--- a/lib/Db/ShareRequest.php
+++ b/lib/Db/ShareRequest.php
@@ -82,7 +82,7 @@ class ShareRequest extends PermissionEntity implements \JsonSerializable {
         return [
             'item_id' => $this->getItemId(),
             'item_guid' => $this->getItemGuid(),
-            'user_id' => $this->getFromUserId(),
+            'user_id' => $this->getTargetUserId(),
             'created' => $this->getCreated(),
             'permissions' => $this->getPermissions(),
             'vault_id' => $this->getTargetUserId(),
diff --git a/lib/Db/ShareRequestMapper.php b/lib/Db/ShareRequestMapper.php
index 95f3f4eb..3e7f5b93 100644
--- a/lib/Db/ShareRequestMapper.php
+++ b/lib/Db/ShareRequestMapper.php
@@ -43,7 +43,8 @@ class ShareRequestMapper extends Mapper {
      * @return ShareRequest[]
      */
     public function getRequestsByItemGuid($item_guid){
-        $q = "SELECT * FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY user_id";
+        $this->db->executeQuery("SET sql_mode = '';");
+        $q = "SELECT *, target_user_id FROM *PREFIX*" . self::TABLE_NAME . " WHERE item_guid = ? GROUP BY target_user_id;";
         return $this->findEntities($q, [$item_guid]);
     }