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

elzody · web-flow · commit f854b1b8738d · 2025-04-08T14:02:40.000-04:00
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -489,8 +489,8 @@ public function uploadFontFile(): JSONResponse {
 	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;
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -489,8 +489,8 @@ public function uploadFontFile(): JSONResponse {`
`489`	`489`	`public function getSettingsFile(string $type, string $token, string $category, string $name) {`
`490`	`490`	`try {`
`491`	`491`	`$wopi = $this->wopiMapper->getWopiForToken($token);`
	`492`	`+ $userId = $wopi->getEditorUid() ?: $wopi->getOwnerUid();`
`492`	`493`	`if ($type === 'userconfig') {`
`493`		`- $userId = $wopi->getEditorUid() ?: $wopi->getOwnerUid();`
`494`	`494`	`$type = $type . '/' . $userId;`
`495`	`495`	`}`
`496`	`496`