Ticket #20871: 20871.2.diff

wp-admin/custom-header.php

@@ -211 +211 @@
 
                 if ( isset( $_POST['resetheader'] ) ) {
                         check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                        $this->process_default_headers();
-                        $default = get_theme_support( 'custom-header', 'default-image' );
-                        $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
-                        foreach ( $this->default_headers as $header => $details ) {
-                                if ( $details['url'] == $default ) {
-                                        $default_data = $details;
-                                        break;
-                                }
-                        }
-                        set_theme_mod( 'header_image', $default );
-                        if ( empty( $default_data['width'] ) )
-                                $default_data['width'] = get_theme_support( 'custom-header', 'width' );
-                        if ( empty( $default_data['height'] ) )
-                                $default_data['height'] = get_theme_support( 'custom-header', 'height' );
-                        set_theme_mod( 'header_image_data', (object) $default_data );
+                        $this->reset_header_image();
                         return;
                 }
 
@@ -237 +223 @@
 
                 if ( isset( $_POST['removeheader'] ) ) {
                         check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                        set_theme_mod( 'header_image', 'remove-header' );
+                        $this->remove_header_image();
                         return;
                 }
 
@@ -256 +242 @@
 
                 if ( isset( $_POST['default-header'] ) ) {
                         check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-                        if ( 'random-default-image' == $_POST['default-header'] ) {
-                                set_theme_mod( 'header_image', 'random-default-image' );
-                        } elseif ( 'random-uploaded-image' == $_POST['default-header'] ) {
-                                set_theme_mod( 'header_image', 'random-uploaded-image' );
-                        } else {
-                                $this->process_default_headers();
-                                $uploaded = get_uploaded_header_images();
-                                if ( isset( $uploaded[$_POST['default-header']] ) ) {
-                                        set_theme_mod( 'header_image', esc_url( $uploaded[$_POST['default-header']]['url'] ) );
-                                        set_theme_mod( 'header_image_data', (object) $uploaded[$_POST['default-header']] );
-                                } elseif ( isset( $this->default_headers[$_POST['default-header']] ) ) {
-                                        set_theme_mod( 'header_image', esc_url( $this->default_headers[$_POST['default-header']]['url'] ) );
-                                        if ( empty( $this->default_headers[$_POST['default-header']]['width'] ) )
-                                                $this->default_headers[$_POST['default-header']]['width'] = get_theme_support( 'custom-header', 'width' );
-                                        if ( empty( $this->default_headers[$_POST['default-header']]['height'] ) )
-                                                $this->default_headers[$_POST['default-header']]['height'] = get_theme_support( 'custom-header', 'height' );
-                                        set_theme_mod( 'header_image_data', (object) $this->default_headers[$_POST['default-header']] );
-                                }
-                        }
+                        $this->choose_existing_header_image( $_POST['default-header'] );
+                        return;
                 }
         }
 
@@ -718 +687 @@
                         wp_die( __( 'Cheatin’ uh?' ) );
 
                 if ( empty( $_POST ) && isset( $_GET['file'] ) ) {
-                        $id = absint( $_GET['file'] );
-                        $file = get_attached_file( $id, true );
-                        $url = wp_get_attachment_image_src( $id, 'full');
+                        $attachment_id = absint( $_GET['file'] );
+                        $file = get_attached_file( $attachment_id, true );
+                        $url = wp_get_attachment_image_src( $attachment_id, 'full');
                         $url = $url[0];
                 } elseif ( isset( $_POST ) ) {
                         extract($this->step_2_manage_upload());
@@ -729 +698 @@
                 if ( file_exists( $file ) ) {
                         list( $width, $height, $type, $attr ) = getimagesize( $file );
                 } else {
-                        $data = wp_get_attachment_metadata( $id );
+                        $data = wp_get_attachment_metadata( $attachment_id );
                         $height = $data[ 'height' ];
                         $width = $data[ 'width' ];
                         unset( $data );
@@ -750 +719 @@
                 {
                         // Add the meta-data
                         if ( file_exists( $file ) )
-                                wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
-                        update_post_meta( $id, '_wp_attachment_is_custom_header', get_option('stylesheet' ) );
+                                wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
 
-                        set_theme_mod('header_image', esc_url($url));
-                        do_action('wp_create_file_in_uploads', $file, $id); // For replication
+                        $this->select_new_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+
+                        do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
                         return $this->finished();
                 } elseif ( $width > $max_width ) {
                         $oitar = $width / $max_width;
@@ -918 +887 @@
                 // Update the attachment
                 $attachment_id = wp_insert_attachment( $object, $cropped );
                 wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $cropped ) );
-                update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_option( 'stylesheet' ) );
 
-                set_theme_mod('header_image', $url);
+                $width = $dst_width;
+                $height = $dst_height;
+                $this->select_new_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
 
-                $header_data                = new stdClass();
-                $header_data->attachment_id = $attachment_id;
-                $header_data->url           = $url;
-                $header_data->thumbnail_url = $url;
-                $header_data->width         = $dst_width;
-                $header_data->height        = $dst_height;
-
-                set_theme_mod( 'header_image_data', $header_data );
-
                 // cleanup
                 $medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
                 if ( file_exists( $medium ) )
@@ -997 +958 @@
                 return array( 'library' => __('Media Library') );
         }
 
+        /**
+         * Remove a header image.
+         *
+         * @since 3.4.0
+         */
+        final public function remove_header_image() {
+                set_theme_mod( 'header_image', 'remove-header' );
+                remove_theme_mod( 'header_image_data' );
+        }
+
+        /**
+         * Reset a header image to the default image for the theme.
+         *
+         * This method does not do anything if the theme does not have a default header image.
+         *
+         * @since 3.4.0
+         */
+        final public function reset_header_image() {
+                $this->process_default_headers();
+                $default = get_theme_support( 'custom-header', 'default-image' );
+
+                if ( ! $default )
+                        return;
+
+                $default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+
+                foreach ( $this->default_headers as $header => $details ) {
+                        if ( $details['url'] == $default ) {
+                                $default_data = $details;
+                                break;
+                        }
+                }
+
+                if ( empty( $default_data['width'] ) )
+                        $default_data['width'] = get_theme_support( 'custom-header', 'width' );
+                if ( empty( $default_data['height'] ) )
+                        $default_data['height'] = get_theme_support( 'custom-header', 'height' );
+                set_theme_mod( 'header_image', $default );
+                set_theme_mod( 'header_image_data', (object) $default_data );
+        }
+
+        /**
+         * Choose a header image, selected from existing uploaded and default headers.
+         *
+         * @param string $choice Which header image to select. Allows for values of 'random-default-image',
+         *      for randomly cycling among the default images; 'random-uploaded-image', for randomly cycling
+         *      among the uploaded images; the key of a default image registered for that theme; and
+         *      the key of an image uploaded for that theme (the basename of the URL).
+         */
+        final public function choose_existing_header_image( $choice ) {
+                if ( 'random-default-image' == $choice ) {
+                        set_theme_mod( 'header_image', 'random-default-image' );
+                        remove_theme_mod( 'header_image_data' );
+                        return;
+                }
+
+                if ( 'random-uploaded-image' == $choice ) {
+                        set_theme_mod( 'header_image', 'random-uploaded-image' );
+                        remove_theme_mod( 'header_image_data' );
+                        return;
+                }
+
+                $this->process_default_headers();
+                if ( isset( $this->default_headers[ $choice ] ) ) {
+                        if ( empty( $this->default_headers[ $choice ]['width'] ) )
+                                $this->default_headers[ $choice ]['width'] = get_theme_support( 'custom-header', 'width' );
+                        if ( empty( $this->default_headers[ $choice ]['height'] ) )
+                                $this->default_headers[ $choice ]['height'] = get_theme_support( 'custom-header', 'height' );
+                        set_theme_mod( 'header_image', esc_url_raw( $this->default_headers[ $choice ]['url'] ) );
+                        set_theme_mod( 'header_image_data', (object) $this->default_headers[ $choice ] );
+                        return;
+                }
+
+                $uploaded = get_uploaded_header_images();
+                if ( isset( $uploaded[ $choice ] ) ) {
+                        set_theme_mod( 'header_image', esc_url_raw( $uploaded[ $choice ]['url'] ) );
+                        set_theme_mod( 'header_image_data', (object) $uploaded[ $choice ] );
+                        return;
+                }
+        }
+
+        /**
+         * Select a header image, either newly uploaded or from the media library.
+         *
+         * @since 3.4.0
+         *
+         * @param array $args An array of arguments: attachment_id, url, width, height. All are required.
+         */
+        final public function select_new_header_image( $args ) {
+                extract( $args );
+
+                $url = esc_url_raw( $url );
+
+                $header_data                = new stdClass();
+                $header_data->attachment_id = $attachment_id;
+                $header_data->url           = $url;
+                $header_data->thumbnail_url = $url;
+                $header_data->width         = $width;
+                $header_data->height        = $height;
+
+                update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+                set_theme_mod( 'header_image', $url );
+                set_theme_mod( 'header_image_data', $header_data );
+        }
 }

wp-admin/custom-background.php

@@ -383 +383 @@
                 wp_update_attachment_metadata( $id, wp_generate_attachment_metadata( $id, $file ) );
                 update_post_meta( $id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
 
-                set_theme_mod('background_image', esc_url($url));
+                set_theme_mod('background_image', esc_url_raw($url));
 
                 $thumbnail = wp_get_attachment_image_src( $id, 'thumbnail' );
-                set_theme_mod('background_image_thumb', esc_url( $thumbnail[0] ) );
+                set_theme_mod('background_image_thumb', esc_url_raw( $thumbnail[0] ) );
 
                 do_action('wp_create_file_in_uploads', $file, $id); // For replication
                 $this->updated = true;
@@ -425 +425 @@
                 update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', get_option('stylesheet' ) );
                 $url = wp_get_attachment_image_src( $attachment_id, $size );
                 $thumbnail = wp_get_attachment_image_src( $attachment_id, 'thumbnail' );
-                set_theme_mod( 'background_image', esc_url( $url[0] ) );
-                set_theme_mod( 'background_image_thumb', esc_url( $thumbnail[0] ) );
+                set_theme_mod( 'background_image', esc_url_raw( $url[0] ) );
+                set_theme_mod( 'background_image_thumb', esc_url_raw( $thumbnail[0] ) );
                 exit;
         }
 }