Index: src/wp-content/themes/twentyseventeen/functions.php =================================================================== --- src/wp-content/themes/twentyseventeen/functions.php (revision 39288) +++ src/wp-content/themes/twentyseventeen/functions.php (working copy) @@ -123,10 +123,30 @@ 'posts' => array( 'home', - 'about', - 'contact', - 'blog', - 'homepage-section', + 'about' => array( + 'thumbnail' => '{{featured-image-2}}', + ), + 'contact' => array( + 'thumbnail' => '{{featured-image-1}}', + ), + 'blog' => array( + 'thumbnail' => '{{featured-image-3}}', + ), + 'homepage-section' => array( + 'thumbnail' => '{{featured-image-1}}', + ), + ), + + 'attachments' => array( + 'featured-image-1' => array( + 'file_url' => '/assets/images/espresso.jpg', + ), + 'featured-image-2' => array( + 'file_url' => '/assets/images/sandwich.jpg', + ), + 'featured-image-3' => array( + 'file_url' => '/assets/images/coffee.jpg', + ), ), 'options' => array( Index: src/wp-includes/class-wp-customize-manager.php =================================================================== --- src/wp-includes/class-wp-customize-manager.php (revision 39288) +++ src/wp-includes/class-wp-customize-manager.php (working copy) @@ -916,6 +916,7 @@ } $sidebars_widgets = isset( $starter_content['widgets'] ) && ! empty( $this->widgets ) ? $starter_content['widgets'] : array(); + $attachments = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array(); $posts = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array(); $options = isset( $starter_content['options'] ) ? $starter_content['options'] : array(); $nav_menus = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array(); @@ -965,9 +966,58 @@ } } + $nav_menus_created_posts = array(); + + // Attachments are technically posts but handled differently. + if ( ! empty( $attachments ) ) { + // Such is The WordPress Way. + require_once( ABSPATH . 'wp-admin/includes/file.php' ); + require_once( ABSPATH . 'wp-admin/includes/media.php' ); + require_once( ABSPATH . 'wp-admin/includes/image.php' ); + + $attachment_ids = array(); + + foreach( $attachments as $symbol => $attributes ) { + if ( is_child_theme() && ! file_exists( get_stylesheet_directory() . $attributes['file_url'] ) ) { + $file = get_template_directory_uri() . $attributes['file_url']; + } else { + $file = get_stylesheet_directory_uri() . $attributes['file_url']; + } + + // We have to replicate logic from inside media_sideload_image() because WordPress. + // See https://core.trac.wordpress.org/ticket/19629 + // Set variables for storage, fix file filename for query strings. + preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches ); + if ( ! $matches ) { + continue; + } + + $file_array = array(); + $file_array['name'] = basename( $matches[0] ); + $file_array['tmp_name'] = download_url( $file ); + + if ( is_wp_error( $file_array['tmp_name'] ) ) { + continue; + } + + $attachment_id = media_handle_sideload( $file_array, 0 ); + // End duplicated logic + + if ( is_wp_error( $attachment_id ) ) { + continue; + } + + // Set this to auto-draft for garbage collection later +// Is this working? I don't think this is working. + wp_update_post( array( 'ID' => $attachment_id, 'post_status' => 'auto-draft' ) ); + $attachment_ids[ $symbol ] = $attachment_id; + + $nav_menus_created_posts = array_merge( $nav_menus_created_posts, array_values( $attachment_ids ) ); + } + } + // Posts & pages. if ( ! empty( $posts ) ) { - $nav_menus_created_posts = array(); if ( ! empty( $changeset_data['nav_menus_created_posts']['value'] ) ) { $nav_menus_created_posts = $changeset_data['nav_menus_created_posts']['value']; } @@ -1004,19 +1054,34 @@ continue; } + // Translate the featured image symbol + if ( ! empty( $posts[ $post_symbol ]['thumbnail'] ) + && preg_match( '/^{{(?P.+)}}$/', $posts[ $post_symbol ]['thumbnail'], $matches ) + && isset( $attachment_ids[ $matches['symbol'] ] ) ) { + $posts[ $post_symbol ][ 'meta_input' ][ '_thumbnail_id' ] = $attachment_ids[ $matches['symbol'] ]; + } + + if ( ! empty( $posts[ $post_symbol ]['page_template'] ) ) { + $posts[ $post_symbol ][ 'meta_input' ][ '_wp_page_template' ] = $posts[ $post_symbol ]['page_template']; + } + $r = $this->nav_menus->insert_auto_draft_post( $posts[ $post_symbol ] ); if ( $r instanceof WP_Post ) { $posts[ $post_symbol ]['ID'] = $r->ID; } } - // The nav_menus_created_posts setting is why nav_menus component is dependency for adding posts. + $nav_menus_created_posts = array_merge( $nav_menus_created_posts, wp_list_pluck( $posts, 'ID' ) ); + } + + // The nav_menus_created_posts setting is why nav_menus component is dependency for adding posts. + if ( ! empty( $this->nav_menus ) && ! empty( $nav_menus_created_posts ) ) { $setting_id = 'nav_menus_created_posts'; - if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) { - $nav_menus_created_posts = array_unique( array_merge( $nav_menus_created_posts, wp_list_pluck( $posts, 'ID' ) ) ); - $this->set_post_value( $setting_id, array_values( $nav_menus_created_posts ) ); - $this->pending_starter_content_settings_ids[] = $setting_id; + if ( ! empty( $changeset_data[ $setting_id ] ) ) { + $nav_menus_created_posts = array_merge( $nav_menus_created_posts, $changeset_data[ $setting_id ] ); } + $this->set_post_value( $setting_id, array_unique( array_values( $nav_menus_created_posts ) ) ); + $this->pending_starter_content_settings_ids[] = $setting_id; } // Nav menus. Index: src/wp-includes/class-wp-customize-nav-menus.php =================================================================== --- src/wp-includes/class-wp-customize-nav-menus.php (revision 39288) +++ src/wp-includes/class-wp-customize-nav-menus.php (working copy) @@ -1191,8 +1191,10 @@ $post_ids = $setting->post_value(); if ( ! empty( $post_ids ) ) { foreach ( $post_ids as $post_id ) { + $target_status = 'attachment' === get_post_type( $post_id ) ? 'inherit' : 'publish'; + // Note that wp_publish_post() cannot be used because unique slugs need to be assigned. - wp_update_post( array( 'ID' => $post_id, 'post_status' => 'publish' ) ); + wp_update_post( array( 'ID' => $post_id, 'post_status' => $target_status ) ); } } } Index: src/wp-includes/theme.php =================================================================== --- src/wp-includes/theme.php (revision 39288) +++ src/wp-includes/theme.php (working copy) @@ -1972,9 +1972,10 @@ foreach ( $config as $type => $args ) { switch( $type ) { - // Use options and theme_mods as-is. + // Use options and theme_mods as-is. Also, attachments, for now. case 'options' : case 'theme_mods' : + case 'attachments' : $content[ $type ] = $config[ $type ]; break; @@ -2012,11 +2013,19 @@ } break; - // Everything else should map at the next level. - default : - foreach( $config[ $type ] as $i => $item ) { - if ( is_array( $item ) ) { - $content[ $type ][ $i ] = $item; + // All that's left now are posts (besides attachments). Not a default case for the sake of clarity and future work. + case 'posts' : + foreach( $config[ $type ] as $id => $item ) { + // Posts and pages can be passed certain other args + if ( is_array( $item ) && ! empty( $core_content[ $type ] ) && ! empty( $core_content[ $type ][ $id ] ) ) { + $content[ $type ][ $id ] = $core_content[ $type ][ $id ]; + + foreach( $item as $key => $value ) { + // This is currently locked down. + if ( 'thumbnail' === $key || 'page_template' === $key ) { + $content[ $type ][ $id ][ $key ] = $value; + } + } } elseif ( is_string( $item ) && ! empty( $core_content[ $type ] ) && ! empty( $core_content[ $type ][ $item ] ) ) { $content[ $type ][ $item ] = $core_content[ $type ][ $item ]; }