Merge remote-tracking branch 'remotes/origin/develop' into feature/nc-27

ONLYOFFICE · Apr 1, 2024 · b2a57c6 · b2a57c6
2 parents 399777d + 5e658ea
commit b2a57c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/Controller/EditorController.php b/lib/Controller/EditorController.php
@@ -385,7 +385,7 @@ public function users($fileId, $operationType = null) {
 
         $excludedGroups = $this->getShareExcludedGroups();
         $isMemberExcludedGroups = true;
-        if (count(array_intersect($currentUserGroups, $excludedGroups)) !== count($currentUserGroups)) {
+        if ((count(array_intersect($currentUserGroups, $excludedGroups)) !== count($currentUserGroups)) || empty($currentUserGroups)) {
             $isMemberExcludedGroups = false;
         }
 
@@ -530,7 +530,7 @@ public function mention($fileId, $anchor, $comment, $emails) {
 
         $excludedGroups = $this->getShareExcludedGroups();
         $isMemberExcludedGroups = true;
-        if (count(array_intersect($currentUserGroups, $excludedGroups)) !== count($currentUserGroups)) {
+        if ((count(array_intersect($currentUserGroups, $excludedGroups)) !== count($currentUserGroups)) || empty($currentUserGroups)) {
             $isMemberExcludedGroups = false;
         }
 

diff --git a/src/editor.js b/src/editor.js
@@ -726,7 +726,7 @@
         if (wrapEl.length > 0) {
             wrapEl[0].style.height = (screen.availHeight - headerHeight) + "px";
             window.scrollTo(0, -1);
-            wrapEl[0].style.height = (window.innerHeight - headerHeight) + "px";
+            wrapEl[0].style.height = (window.top.innerHeight - headerHeight) + "px";
         }
     };