Merge branch 'feature/nc-23' into develop

2 files changed, 9 insertions, 5 deletions

diff --git a/controller/sharingapicontroller.php b/controller/sharingapicontroller.php
index 12ab326..1e5e633 100644
--- a/controller/sharingapicontroller.php
+++ b/controller/sharingapicontroller.php
@@ -155,8 +155,8 @@ class SharingApiController extends OCSController {
             return new DataResponse([]);
         }
 
-        $sharesUser = $this->shareManager->getSharesBy($userId, IShare::TYPE_USER, $sourceFile);
-        $sharesGroup = $this->shareManager->getSharesBy($userId, IShare::TYPE_GROUP, $sourceFile);
+        $sharesUser = $this->shareManager->getSharesBy($userId, IShare::TYPE_USER, $sourceFile, null, true);
+        $sharesGroup = $this->shareManager->getSharesBy($userId, IShare::TYPE_GROUP, $sourceFile, null, true);
         $shares = array_merge($sharesUser, $sharesGroup);
         $extras = $this->extraPermissions->getExtras($shares, $sourceFile);
 
diff --git a/lib/extrapermissions.php b/lib/extrapermissions.php
index e98f37c..26a7d33 100644
--- a/lib/extrapermissions.php
+++ b/lib/extrapermissions.php
@@ -254,7 +254,7 @@ class ExtraPermissions {
     /**
      * Delete list extra permissions
      *
-     * @param integer $shareIds - array of share identifiers
+     * @param array $shareIds - array of share identifiers
      *
      * @return bool
      */
@@ -293,7 +293,9 @@ class ExtraPermissions {
 
         $values = $result ? $select->fetch() : [];
 
-        return $values;
+        $value = is_array($values) ? $values : [];
+
+        return $value;
     }
 
     /**
@@ -323,7 +325,9 @@ class ExtraPermissions {
 
         $values = $result ? $select->fetchAll() : [];
 
-        return $values;
+        $value = is_array($values) ? $values : [];
+
+        return $value;
     }
 
     /**