enmi-conf.org: comparison wp/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

equal deleted inserted replaced

-:7b1b88e27a20
+:48c4eec2b7e6
 			}
 		}
 		// Filter query clauses to include filenames.
 		if ( isset( $query_args['s'] ) ) {
-			add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+			add_filter( 'wp_allow_query_attachment_by_filename', '__return_true' );
 		}
 		return $query_args;
 	}
 		if ( isset( $request['alt_text'] ) ) {
 			update_post_meta( $attachment_id, '_wp_attachment_image_alt', sanitize_text_field( $request['alt_text'] ) );
 		}
+		if ( ! empty( $schema['properties']['featured_media'] ) && isset( $request['featured_media'] ) ) {
+			$thumbnail_update = $this->handle_featured_media( $request['featured_media'], $attachment_id );
+			if ( is_wp_error( $thumbnail_update ) ) {
+				return $thumbnail_update;
+			}
+		}
 		if ( ! empty( $schema['properties']['meta'] ) && isset( $request['meta'] ) ) {
 			$meta_update = $this->meta->update_value( $request['meta'], $attachment_id );
 			if ( is_wp_error( $meta_update ) ) {
 				return $meta_update;
 		$attachment    = get_post( $attachment_id );
 		$fields_update = $this->update_additional_fields_for_object( $attachment, $request );
 		if ( is_wp_error( $fields_update ) ) {
 			return $fields_update;
+		}
+		$terms_update = $this->handle_terms( $attachment_id, $request );
+		if ( is_wp_error( $terms_update ) ) {
+			return $terms_update;
 		}
 		$request->set_param( 'context', 'edit' );
 		/**
 		 */
 		do_action( 'rest_after_insert_attachment', $attachment, $request, true );
 		wp_after_insert_post( $attachment, false, null );
-		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+		if ( wp_is_serving_rest_request() ) {
-			// Set a custom header with the attachment_id.
+			/*
-			// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 * Set a custom header with the attachment_id.
+			 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 */
 			header( 'X-WP-Upload-Attachment-ID: ' . $attachment_id );
 		}
 		// Include media and image functions to get access to wp_generate_attachment_metadata().
 		require_once ABSPATH . 'wp-admin/includes/media.php';
 		require_once ABSPATH . 'wp-admin/includes/image.php';
-		// Post-process the upload (create image sub-sizes, make PDF thumbnails, etc.) and insert attachment meta.
+		/*
-		// At this point the server may run out of resources and post-processing of uploaded images may fail.
+		 * Post-process the upload (create image sub-sizes, make PDF thumbnails, etc.) and insert attachment meta.
+		 * At this point the server may run out of resources and post-processing of uploaded images may fail.
+		 */
 		wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 		$response = $this->prepare_item_for_response( $attachment, $request );
 		$response = rest_ensure_response( $response );
 		$response->set_status( 201 );
 	protected function insert_attachment( $request ) {
 		// Get the file via $_FILES or raw data.
 		$files   = $request->get_file_params();
 		$headers = $request->get_headers();
+		$time = null;
+		// Matches logic in media_handle_upload().
+		if ( ! empty( $request['post'] ) ) {
+			$post = get_post( $request['post'] );
+			// The post date doesn't usually matter for pages, so don't backdate this upload.
+			if ( $post && 'page' !== $post->post_type && substr( $post->post_date, 0, 4 ) > 0 ) {
+				$time = $post->post_date;
+			}
+		}
 		if ( ! empty( $files ) ) {
-			$file = $this->upload_from_file( $files, $headers );
+			$file = $this->upload_from_file( $files, $headers, $time );
 		} else {
-			$file = $this->upload_from_data( $request->get_body(), $headers );
+			$file = $this->upload_from_data( $request->get_body(), $headers, $time );
 		}
 		if ( is_wp_error( $file ) ) {
 			return $file;
 		}
 		$attachment = $this->prepare_item_for_database( $request );
 		$attachment->post_mime_type = $type;
 		$attachment->guid           = $url;
+		// If the title was not set, use the original filename.
+		if ( empty( $attachment->post_title ) && ! empty( $files['file']['name'] ) ) {
+			// Remove the file extension (after the last `.`)
+			$tmp_title = substr( $files['file']['name'], 0, strrpos( $files['file']['name'], '.' ) );
+			if ( ! empty( $tmp_title ) ) {
+				$attachment->post_title = $tmp_title;
+			}
+		}
+		// Fall back to the original approach.
 		if ( empty( $attachment->post_title ) ) {
 			$attachment->post_title = preg_replace( '/\.[^.]+$/', '', wp_basename( $file ) );
 		}
 		// $post_parent is inherited from $attachment['post_parent'].
 			'file'          => $file,
 		);
 	}
 	/**
+	 * Determines the featured media based on a request param.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param int $featured_media Featured Media ID.
+	 * @param int $post_id        Post ID.
+	 * @return bool|WP_Error Whether the post thumbnail was successfully deleted, otherwise WP_Error.
+	 */
+	protected function handle_featured_media( $featured_media, $post_id ) {
+		$post_type         = get_post_type( $post_id );
+		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
+		// Similar check as in wp_insert_post().
+		if ( ! $thumbnail_support && get_post_mime_type( $post_id ) ) {
+			if ( wp_attachment_is( 'audio', $post_id ) ) {
+				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
+			} elseif ( wp_attachment_is( 'video', $post_id ) ) {
+				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+			}
+		}
+		if ( $thumbnail_support ) {
+			return parent::handle_featured_media( $featured_media, $post_id );
+		}
+		return new WP_Error(
+			'rest_no_featured_media',
+			sprintf(
+				/* translators: %s: attachment mime type */
+				__( 'This site does not support post thumbnails on attachments with MIME type %s.' ),
+				get_post_mime_type( $post_id )
+			),
+			array( 'status' => 400 )
+		);
+	}
+	/**
 	 * Updates a single attachment.
 	 *
 	 * @since 4.7.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 		if ( isset( $request['alt_text'] ) ) {
 			update_post_meta( $data['id'], '_wp_attachment_image_alt', $request['alt_text'] );
 		}
 		$attachment = get_post( $request['id'] );
+		if ( ! empty( $schema['properties']['featured_media'] ) && isset( $request['featured_media'] ) ) {
+			$thumbnail_update = $this->handle_featured_media( $request['featured_media'], $attachment->ID );
+			if ( is_wp_error( $thumbnail_update ) ) {
+				return $thumbnail_update;
+			}
+		}
 		$fields_update = $this->update_additional_fields_for_object( $attachment, $request );
 		if ( is_wp_error( $fields_update ) ) {
 			return $fields_update;
 				__( 'Unable to get meta information for file.' ),
 				array( 'status' => 404 )
 			);
 		}
-		$supported_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/webp' );
+		$supported_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/webp', 'image/avif' );
 		$mime_type       = get_post_mime_type( $attachment_id );
 		if ( ! in_array( $mime_type, $supported_types, true ) ) {
 			return new WP_Error(
 				'rest_cannot_edit_file_type',
 				__( 'This type of file cannot be edited.' ),
 					break;
 				case 'crop':
 					$size = $image_editor->get_size();
-					$crop_x = round( ( $size['width'] * $args['left'] ) / 100.0 );
+					$crop_x = (int) round( ( $size['width'] * $args['left'] ) / 100.0 );
-					$crop_y = round( ( $size['height'] * $args['top'] ) / 100.0 );
+					$crop_y = (int) round( ( $size['height'] * $args['top'] ) / 100.0 );
-					$width  = round( ( $size['width'] * $args['width'] ) / 100.0 );
+					$width  = (int) round( ( $size['width'] * $args['width'] ) / 100.0 );
-					$height = round( ( $size['height'] * $args['height'] ) / 100.0 );
+					$height = (int) round( ( $size['height'] * $args['height'] ) / 100.0 );
-					if ( $size['width'] !== $width && $size['height'] !== $height ) {
+					if ( $size['width'] !== $width || $size['height'] !== $height ) {
 						$result = $image_editor->crop( $crop_x, $crop_y, $width, $height );
 						if ( is_wp_error( $result ) ) {
 							return new WP_Error(
 								'rest_image_crop_failed',
 		// Calculate the file name.
 		$image_ext  = pathinfo( $image_file, PATHINFO_EXTENSION );
 		$image_name = wp_basename( $image_file, ".{$image_ext}" );
-		// Do not append multiple `-edited` to the file name.
+		/*
-		// The user may be editing a previously edited image.
+		 * Do not append multiple `-edited` to the file name.
+		 * The user may be editing a previously edited image.
+		 */
 		if ( preg_match( '/-edited(-\d+)?$/', $image_name ) ) {
 			// Remove any `-1`, `-2`, etc. `wp_unique_filename()` will add the proper number.
 			$image_name = preg_replace( '/-edited(-\d+)?$/', '-edited', $image_name );
 		} else {
 			// Append `-edited` before the extension.
 		if ( ! empty( $image_alt ) ) {
 			// update_post_meta() expects slashed.
 			update_post_meta( $new_attachment_id, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
 		}
-		if ( defined( 'REST_REQUEST' ) && REST_REQUEST ) {
+		if ( wp_is_serving_rest_request() ) {
-			// Set a custom header with the attachment_id.
+			/*
-			// Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 * Set a custom header with the attachment_id.
+			 * Used by the browser/client to resume creating image sub-sizes after a PHP fatal error.
+			 */
 			header( 'X-WP-Upload-Attachment-ID: ' . $new_attachment_id );
 		}
 		// Generate image sub-sizes and meta.
 		$new_image_meta = wp_generate_attachment_metadata( $new_attachment_id, $saved['path'] );
 	 * @param WP_REST_Request $request Request object.
 	 * @return WP_REST_Response Response object.
 	 */
 	public function prepare_item_for_response( $item, $request ) {
 		// Restores the more descriptive, specific name for use within this method.
-		$post     = $item;
+		$post = $item;
 		$response = parent::prepare_item_for_response( $post, $request );
 		$fields   = $this->get_fields_for_response( $request );
 		$data     = $response->get_data();
 		if ( in_array( 'description', $fields, true ) ) {
 		if ( in_array( 'media_details', $fields, true ) ) {
 			$data['media_details'] = wp_get_attachment_metadata( $post->ID );
 			// Ensure empty details is an empty object.
 			if ( empty( $data['media_details'] ) ) {
-				$data['media_details'] = new stdClass;
+				$data['media_details'] = new stdClass();
 			} elseif ( ! empty( $data['media_details']['sizes'] ) ) {
 				foreach ( $data['media_details']['sizes'] as $size => &$size_data ) {
 					if ( isset( $size_data['mime-type'] ) ) {
 						'mime_type'  => $post->post_mime_type,
 						'source_url' => $full_src[0],
 					);
 				}
 			} else {
-				$data['media_details']['sizes'] = new stdClass;
+				$data['media_details']['sizes'] = new stdClass();
 			}
 		}
 		if ( in_array( 'post', $fields, true ) ) {
 			$data['post'] = ! empty( $post->post_parent ) ? (int) $post->post_parent : null;
 	/**
 	 * Handles an upload via raw POST data.
 	 *
 	 * @since 4.7.0
-	 *
+	 * @since 6.6.0 Added the `$time` parameter.
-	 * @param array $data    Supplied file data.
+	 *
-	 * @param array $headers HTTP headers from the request.
+	 * @param string      $data    Supplied file data.
+	 * @param array       $headers HTTP headers from the request.
+	 * @param string|null $time    Optional. Time formatted in 'yyyy/mm'. Default null.
 	 * @return array|WP_Error Data from wp_handle_sideload().
 	 */
-	protected function upload_from_data( $data, $headers ) {
+	protected function upload_from_data( $data, $headers, $time = null ) {
 		if ( empty( $data ) ) {
 			return new WP_Error(
 				'rest_upload_no_data',
 				__( 'No data supplied.' ),
 				array( 'status' => 400 )
 		$overrides = array(
 			'test_form' => false,
 		);
-		$sideloaded = wp_handle_sideload( $file_data, $overrides );
+		$sideloaded = wp_handle_sideload( $file_data, $overrides, $time );
 		if ( isset( $sideloaded['error'] ) ) {
 			@unlink( $tmpfname );
 			return new WP_Error(
 		$filename = null;
 		foreach ( $disposition_header as $value ) {
 			$value = trim( $value );
-			if ( strpos( $value, ';' ) === false ) {
+			if ( ! str_contains( $value, ';' ) ) {
 				continue;
 			}
 			list( $type, $attr_parts ) = explode( ';', $value, 2 );
 			$attr_parts = explode( ';', $attr_parts );
 			$attributes = array();
 			foreach ( $attr_parts as $part ) {
-				if ( strpos( $part, '=' ) === false ) {
+				if ( ! str_contains( $part, '=' ) ) {
 					continue;
 				}
 				list( $key, $value ) = explode( '=', $part, 2 );
 			}
 			$filename = trim( $attributes['filename'] );
 			// Unquote quoted filename, but after trimming.
-			if ( substr( $filename, 0, 1 ) === '"' && substr( $filename, -1, 1 ) === '"' ) {
+			if ( str_starts_with( $filename, '"' ) && str_ends_with( $filename, '"' ) ) {
 				$filename = substr( $filename, 1, -1 );
 			}
 		}
 		return $filename;
 	/**
 	 * Handles an upload via multipart/form-data ($_FILES).
 	 *
 	 * @since 4.7.0
-	 *
+	 * @since 6.6.0 Added the `$time` parameter.
-	 * @param array $files   Data from the `$_FILES` superglobal.
+	 *
-	 * @param array $headers HTTP headers from the request.
+	 * @param array       $files   Data from the `$_FILES` superglobal.
+	 * @param array       $headers HTTP headers from the request.
+	 * @param string|null $time    Optional. Time formatted in 'yyyy/mm'. Default null.
 	 * @return array|WP_Error Data from wp_handle_upload().
 	 */
-	protected function upload_from_file( $files, $headers ) {
+	protected function upload_from_file( $files, $headers, $time = null ) {
 		if ( empty( $files ) ) {
 			return new WP_Error(
 				'rest_upload_no_data',
 				__( 'No data supplied.' ),
 				array( 'status' => 400 )
 		}
 		// Include filesystem functions to get access to wp_handle_upload().
 		require_once ABSPATH . 'wp-admin/includes/file.php';
-		$file = wp_handle_upload( $files['file'], $overrides );
+		$file = wp_handle_upload( $files['file'], $overrides, $time );
 		if ( isset( $file['error'] ) ) {
 			return new WP_Error(
 				'rest_upload_unknown_error',
 				$file['error'],
 				'minimum'     => 0,
 				'maximum'     => 100,
 			),
 		);
 	}
 }

changeset 21	48c4eec2b7e6
parent 19	3d72ae0968f4
child 22	8c2e4d02f4ef