Media: send numerical post id when uploading image (#57388)

* Always send a numerical post ID. Templates and template parts use string ids comprising "theme + // + template name". * Don't assign a post at all if id is not a number or wp_id (for templates) doesn't exist.
WordPress · Dec 28, 2023 · 1fface7 · 1fface7 · github-actions · Dec 28, 2023
1 parent 31706d5
commit 1fface7
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/packages/editor/src/utils/media-upload/index.js b/packages/editor/src/utils/media-upload/index.js
@@ -31,17 +31,24 @@ export default function mediaUpload( {
 	onError = noop,
 	onFileChange,
 } ) {
-	const { getCurrentPostId, getEditorSettings } = select( editorStore );
+	const { getCurrentPost, getEditorSettings } = select( editorStore );
 	const wpAllowedMimeTypes = getEditorSettings().allowedMimeTypes;
 	maxUploadFileSize =
 		maxUploadFileSize || getEditorSettings().maxUploadFileSize;
-	const currentPostId = getCurrentPostId();
+	const currentPost = getCurrentPost();
+	// Templates and template parts' numerical ID is stored in `wp_id`.
+	const currentPostId =
+		typeof currentPost?.id === 'number'
+			? currentPost.id
+			: currentPost?.wp_id;
+	const postData = currentPostId ? { post: currentPostId } : {};
+
 	uploadMedia( {
 		allowedTypes,
 		filesList,
 		onFileChange,
 		additionalData: {
-			...( ! isNaN( currentPostId ) ? { post: currentPostId } : {} ),
+			...postData,
 			...additionalData,
 		},
 		maxUploadFileSize,