Changeset 33446

Timestamp:

07/27/2015 04:08:47 PM (11 years ago)

Author:

obenland

Message:

Site Icon: Minor cleanup for WP_Site_Icon after [33329].

File:

• trunk/src/wp-admin/includes/class-wp-site-icon.php (modified) (4 diffs)

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -66 +66 @@
          */
         public function __construct() {
-                add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ), 10, 1 );
+                add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
                 add_filter( 'get_post_metadata', array( $this, 'get_post_metadata' ), 10, 4 );
         }
@@ -111 +111 @@
         public function insert_attachment( $object, $file ) {
                 $attachment_id = wp_insert_attachment( $object, $file );
-                $this->update_attachment_metadata( $attachment_id, $file );
-
-                return $attachment_id;
-        }
-
-        /**
-         * Handles updating the metadata of an attachment.
-         *
-         * @since 4.3.0
-         *
-         * @param int    $attachment_id Attachment ID
-         * @param string $file          File path of the attached image.
-         */
-        public function update_attachment_metadata( $attachment_id, $file ) {
-                $metadata = wp_generate_attachment_metadata( $attachment_id, $file );
+                $metadata      = wp_generate_attachment_metadata( $attachment_id, $file );
 
                 /**
@@ -138 +124 @@
                 $metadata = apply_filters( 'site_icon_attachment_metadata', $metadata );
                 wp_update_attachment_metadata( $attachment_id, $metadata );
+
+                return $attachment_id;
         }
 
@@ -195 +183 @@
          */
         public function intermediate_image_sizes( $sizes = array() ) {
-                /** This filter is documented in wp-admin/includes/site-icon.php */
+                /** This filter is documented in wp-admin/includes/class-wp-site-icon.php */
                 $this->site_icon_sizes = apply_filters( 'site_icon_image_sizes', $this->site_icon_sizes );
                 foreach ( $this->site_icon_sizes as $size ) {