Merge pull request #1715 from nextcloud/bugfix/noid/keep-attachment-type

nickvergessen · web-flow · commit 0d5610285e84 · 2026-01-21T07:43:16.000+01:00
fix(attachments): Correctly keep intended attachment extension
diff --git a/lib/Service/NotesService.php b/lib/Service/NotesService.php
@@ -260,7 +260,8 @@ public function createImage(string $userId, int $noteid, $fileDataArray) {
 		} catch (\Exception $e) {
 			$filename = uniqid();
 		}
-		$filename = $filename . '.' . explode('.', $fileDataArray['name'])[1];
+		$parts = explode('.', $fileDataArray['name']);
+		$filename .= '.' . end($parts);
 
 		if ($fileDataArray['tmp_name'] === '') {
 			throw new ImageNotWritableException();

Original file line number	Diff line number	Diff line change
`@@ -260,7 +260,8 @@ public function createImage(string $userId, int $noteid, $fileDataArray) {`
`260`	`260`	`} catch (\Exception $e) {`
`261`	`261`	`$filename = uniqid();`
`262`	`262`	`}`
`263`		`- $filename = $filename . '.' . explode('.', $fileDataArray['name'])[1];`
	`263`	`+ $parts = explode('.', $fileDataArray['name']);`
	`264`	`+ $filename .= '.' . end($parts);`
`264`	`265`
`265`	`266`	`if ($fileDataArray['tmp_name'] === '') {`
`266`	`267`	`throw new ImageNotWritableException();`