From 8880458212587b497743ef4f309d491fa1c6260d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Wed, 19 Dec 2018 03:27:26 +0000 Subject: [PATCH] REST API: Remove a duplicate `require_once()`. In `WP_REST_Attachments_Controller::create_item()`, `wp-admin/includes/image.php` was being `require_once()`-ed... twice. The superflous `require_once()` has been quietly removed. Props david.binda. Merges [44206] to trunk. Fixes #45420. Built from https://develop.svn.wordpress.org/trunk@44309 git-svn-id: http://core.svn.wordpress.org/trunk@44139 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- .../rest-api/endpoints/class-wp-rest-attachments-controller.php | 1 - wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php index 16d1e48c51..640979cb7a 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php @@ -174,7 +174,6 @@ class WP_REST_Attachments_Controller extends WP_REST_Posts_Controller { // Include admin function to get access to wp_generate_attachment_metadata(). require_once ABSPATH . 'wp-admin/includes/media.php'; - require_once ABSPATH . 'wp-admin/includes/image.php'; wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 9dccf35638..3c2587cdf2 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -13,7 +13,7 @@ * * @global string $wp_version */ -$wp_version = '5.1-alpha-44308'; +$wp_version = '5.1-alpha-44309'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.