Merge branch 'main' into automated/noid/main-fix-npm-audit

This commit is contained in:
Elizabeth Danzberger 2025-04-08 14:02:40 -04:00 committed by GitHub
commit f854b1b873
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -489,8 +489,8 @@ class SettingsController extends Controller {
public function getSettingsFile(string $type, string $token, string $category, string $name) {
try {
$wopi = $this->wopiMapper->getWopiForToken($token);
$userId = $wopi->getEditorUid() ?: $wopi->getOwnerUid();
if ($type === 'userconfig') {
$userId = $wopi->getEditorUid() ?: $wopi->getOwnerUid();
$type = $type . '/' . $userId;
}