diff --git a/wp-admin/images/w-logo-white.png b/wp-admin/images/w-logo-white.png index c930887c23..ed5efcdc00 100644 Binary files a/wp-admin/images/w-logo-white.png and b/wp-admin/images/w-logo-white.png differ diff --git a/wp-admin/includes/admin.php b/wp-admin/includes/admin.php index 7d2437b2b8..a44abba917 100644 --- a/wp-admin/includes/admin.php +++ b/wp-admin/includes/admin.php @@ -72,9 +72,6 @@ require_once(ABSPATH . 'wp-admin/includes/user.php'); /** WordPress Site Icon API */ require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php'); -/** WordPress Custom Logo API */ -require_once(ABSPATH . 'wp-admin/includes/class-wp-custom-logo.php'); - /** WordPress Update Administration API */ require_once(ABSPATH . 'wp-admin/includes/update.php'); diff --git a/wp-admin/includes/class-wp-custom-logo.php b/wp-admin/includes/class-wp-custom-logo.php deleted file mode 100644 index 5549eefcb9..0000000000 --- a/wp-admin/includes/class-wp-custom-logo.php +++ /dev/null @@ -1,109 +0,0 @@ - - - - post_status, array( 'pending', 'draft', 'future' ) ) ) { if ( $can_edit_post ) { - $unpublished_link = set_url_scheme( get_permalink( $post ) ); - $preview_link = get_preview_post_link( $post, array(), $unpublished_link ); + $preview_link = get_preview_post_link( $post ); $actions['view'] = sprintf( '%s', esc_url( $preview_link ), diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php index 2a41442534..8be61474bc 100644 --- a/wp-admin/includes/post.php +++ b/wp-admin/includes/post.php @@ -1294,8 +1294,7 @@ function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) { if ( current_user_can( 'read_post', $post->ID ) ) { if ( 'draft' === $post->post_status ) { - $draft_link = set_url_scheme( get_permalink( $post->ID ) ); - $view_link = get_preview_post_link( $post, array(), $draft_link ); + $view_link = get_preview_post_link( $post ); $preview_target = " target='wp-preview-{$post->ID}'"; } else { if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) { diff --git a/wp-content/themes/twentyfifteen/functions.php b/wp-content/themes/twentyfifteen/functions.php index e109a2bcff..7daeefae7e 100644 --- a/wp-content/themes/twentyfifteen/functions.php +++ b/wp-content/themes/twentyfifteen/functions.php @@ -103,6 +103,14 @@ function twentyfifteen_setup() { 'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat' ) ); + /* + * Enable support for custom logo. + * + * @since Twenty Fifteen 1.5 + */ + add_image_size( 'twentyfifteen-logo', 248, 248 ); + add_theme_support( 'custom-logo', array( 'size' => 'twentyfifteen-logo' ) ); + $color_scheme = twentyfifteen_get_color_scheme(); $default_color = trim( $color_scheme[0], '#' ); diff --git a/wp-content/themes/twentyfifteen/header.php b/wp-content/themes/twentyfifteen/header.php index e415915c59..28de34ed9f 100644 --- a/wp-content/themes/twentyfifteen/header.php +++ b/wp-content/themes/twentyfifteen/header.php @@ -29,6 +29,8 @@