Ticket #25443: 25443.diff

src/wp-admin/custom-header.php

@@ -633 +633 @@
 </table>
 <?php endif;
 
+/**
+ * Fires just before the submit button in the custom header options form.
+ *
+ * @since 3.1.0
+ */
 do_action( 'custom_header_options' );
 
 wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
@@ -690 +695 @@
 
                         $this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
-                        do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
+                        /**
+                         * Fires after the header image is set or an error is returned.
+                         *
+                         * @since 2.1.0
+                         *
+                         * @param string $file          Path to the file.
+                         * @param int    $attachment_id Attachment ID.
+                         */
+                        do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication
+
                         return $this->finished();
                 } elseif ( $width > $max_width ) {
                         $oitar = $width / $max_width;
@@ -698 +712 @@
                         if ( ! $image || is_wp_error( $image ) )
                                 wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
-                        $image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication
+                        //duplicate_hook
+                        $image = apply_filters( 'wp_create_file_in_uploads', $image, $attachment_id ); // For replication
 
                         $url = str_replace(basename($url), basename($image), $url);
                         $width = $width / $oitar;
@@ -839 +854 @@
                 if ( ! $cropped || is_wp_error( $cropped ) )
                         wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
 
-                $cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
+                //duplicate_hook
+                $cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
 
                 $parent = get_post($attachment_id);
                 $parent_url = $parent->guid;
@@ -870 +886 @@
 
                 // cleanup
                 $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
-                if ( file_exists( $medium ) )
+                if ( file_exists( $medium ) ) {
+                        //duplicate_hook
                         @unlink( apply_filters( 'wp_delete_file', $medium ) );
-                if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) )
+                }
+
+                if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
+                        //duplicate_hook
                         @unlink( apply_filters( 'wp_delete_file', $original ) );
+                }
 
                 return $this->finished();
         }