Changeset 46174 for trunk/src/wp-admin/includes/media.php

Timestamp:

09/19/2019 01:25:14 AM (6 years ago)

Author:

azaozz

Message:

Uploads: add helper functions for setting, getting, and deleting the temp upload reference used to the attachment_id when retrying to make image sub-sizes.

See #47872.

File:

• trunk/src/wp-admin/includes/media.php (modified) (4 diffs)

trunk/src/wp-admin/includes/media.php

@@ -309 +309 @@
     $name = wp_basename( $name, ".$ext" );
 
-    $url       = $file['url'];
-    $type      = $file['type'];
-    $file      = $file['file'];
-    $title     = sanitize_text_field( $name );
-    $content   = '';
-    $excerpt   = '';
-    $image_ref = false;
+    $url     = $file['url'];
+    $type    = $file['type'];
+    $file    = $file['file'];
+    $title   = sanitize_text_field( $name );
+    $content = '';
+    $excerpt = '';
+    $_ref    = false;
 
     if ( preg_match( '#^audio#', $type ) ) {
@@ -377 +377 @@
         // Use image exif/iptc data for title and caption defaults if possible.
     } elseif ( 0 === strpos( $type, 'image/' ) ) {
-        // Image file reference passed by the uploader.
-        if ( ! empty( $_POST['_wp_temp_image_ref'] ) ) {
-            $image_ref = preg_replace( '/[^a-zA-Z0-9_]/', '', $_POST['_wp_temp_image_ref'] );
-        }
-
         $image_meta = wp_read_image_metadata( $file );
 
@@ -416 +411 @@
     if ( ! is_wp_error( $attachment_id ) ) {
         // If an image, keep the upload reference until all image sub-sizes are created.
-        if ( $image_ref ) {
-            set_transient( '_wp_temp_image_ref:' . $image_ref, $attachment_id, HOUR_IN_SECONDS );
+        if ( ! empty( $_POST['_wp_temp_upload_ref'] ) && wp_attachment_is_image( $attachment_id ) ) {
+            $_ref = _wp_set_upload_ref( $_POST['_wp_temp_upload_ref'], $attachment_id );
         }
 
@@ -426 +421 @@
         // At this point the image is uploaded successfully even if there were specific errors or some sub-sizes were not created.
         // The transient is not needed any more.
-        if ( $image_ref ) {
-            delete_transient( '_wp_temp_image_ref:' . $image_ref );
+        if ( $_ref ) {
+            _wp_clear_upload_ref( $_POST['_wp_temp_upload_ref'] );
         }
     }