Ticket #33755: 33755.16.diff

src/wp-admin/includes/admin.php

@@ -72 +72 @@
 /** 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');
 

src/wp-admin/includes/class-wp-custom-logo.php

@@ -1 @@
-<?php
-/**
- * Administration API: WP_Custom_Logo class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.5.0
- */
-
-/**
- * Core class used to implement custom logo functionality.
- *
- * @since 4.5.0
- */
-class WP_Custom_Logo {
-
-        /**
-         * Get current logo settings stored in theme mod.
-         *
-         * @since 4.5.0
-         * @access public
-         */
-        public function __construct() {
-                add_action( 'wp_head', array( $this, 'head_text_styles' ) );
-                add_action( 'delete_attachment', array( $this, 'delete_attachment_data' ) );
-        }
-
-        /**
-         * Hides header text on the front end if necessary.
-         *
-         * @since 4.5.0
-         * @access public
-         */
-        public function head_text_styles() {
-                // Bail if our theme supports custom headers.
-                if ( current_theme_supports( 'custom-header' ) || get_theme_mod( 'custom_logo_header_text', true ) ) {
-                        return;
-                }
-
-                // Is Display Header Text unchecked? If so, hide the header text.
-                ?>
-                <!-- Custom Logo: hide header text -->
-                <style type="text/css">
-                        <?php echo sanitize_html_class( $this->header_text_classes() ); ?>  {
-                                position: absolute;
-                                clip: rect(1px, 1px, 1px, 1px);
-                        }
-                </style>
-                <?php
-        }
-
-        /**
-         * Reset the custom logo if the current logo is deleted in the media manager.
-         *
-         * @since 4.5.0
-         * @access public
-         *
-         * @param int $post_id Post ID.
-         */
-        public function delete_attachment_data( $post_id ) {
-                $custom_logo_id = get_theme_mod( 'custom_logo' );
-
-                if ( $custom_logo_id && $custom_logo_id == $post_id ) {
-                        remove_theme_mod( 'custom_logo' );
-                }
-        }
-
-        /**
-         * Retrieves the header text classes.
-         *
-         * If not defined in add_theme_support(), defaults from Underscores will be used.
-         *
-         * @since 4.5.0
-         * @access protected
-         *
-         * @return string String of classes to hide.
-         */
-        protected function header_text_classes() {
-                $args = get_theme_support( 'custom-logo' );
-
-                if ( isset( $args[0]['header-text'] ) ) {
-                        // Use any classes defined in add_theme_support().
-                        $classes = $args[0]['header-text'];
-                } else {
-                        // Otherwise, use these defaults, which will work with any Underscores-based theme.
-                        $classes = array(
-                                'site-title',
-                                'site-description',
-                        );
-                }
-
-                // If there's an array of classes, reduce them to a string for output.
-                if ( is_array( $classes ) ) {
-                        $classes = array_map( 'sanitize_html_class', $classes );
-                        $classes = (string) '.' . implode( ', .', $classes );
-                } else {
-                        $classes = (string) '.' . $classes;
-                }
-
-                return $classes;
-        }
-}
-
-/**
- * WP_Custom_Logo instance.
- *
- * @global WP_Custom_Logo $wp_custom_logo
- */
-$GLOBALS['wp_custom_logo'] = new WP_Custom_Logo;

src/wp-includes/class-wp-customize-manager.php

@@ -1922 +1922 @@
                         'section'    => 'title_tagline',
                 ) );
 
-                // Add a setting to hide header text if the theme isn't supporting the feature itself.
-                // @todo
-                if ( ! current_theme_supports( 'custom-header' ) ) {
+                // Add a setting to hide header text if the theme doesn't support custom headers.
+                if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
                         $this->add_setting( 'header_text', array(
+                                'theme_supports'    => array( 'custom-logo', 'header-text' ),
                                 'default'           => 1,
                                 'sanitize_callback' => 'absint',
-                                'transport'         => 'postMessage',
                         ) );
 
                         $this->add_control( 'header_text', array(

src/wp-includes/default-filters.php

@@ -371 +371 @@
  */
 // Theme
 add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
+add_action( 'wp_head', '_custom_logo_just_in_time' );
 add_action( 'plugins_loaded', '_wp_customize_include' );
 add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );
 add_action( 'delete_attachment', '_delete_attachment_theme_mod' );

src/wp-includes/general-template.php

@@ -880 +880 @@
         if ( is_multisite() && ms_is_switched() ) {
                 restore_current_blog();
         }
-        $size = get_theme_support( 'custom-logo' );
-        $size = $size[0]['size'];
+        $size = get_theme_support( 'custom-logo', 'size' );
 
         // We have a logo. Logo is go.
         if ( $custom_logo_id ) {

src/wp-includes/theme.php

@@ -1732 +1732 @@
 }
 
 /**
+ * Registers the internal custom header and background routines.
+ *
+ * @since 4.5.0
+ * @access private
+ */
+function _custom_logo_just_in_time() {
+        if ( ! current_theme_supports( 'custom-header' ) && get_theme_support( 'custom-logo', 'header-text' ) && ! get_theme_mod( 'header_text', true ) ) {
+                $classes = (array) get_theme_support( 'custom-logo', 'header-text' );
+                $classes = array_map( 'sanitize_html_class', $classes );
+                $classes = '.' . implode( ', .', $classes );
+
+                ?>
+                <!-- Custom Logo: hide header text -->
+                <style type="text/css">
+                        <?php echo $classes; ?> {
+                                position: absolute;
+                                clip: rect(1px, 1px, 1px, 1px);
+                        }
+                </style>
+        <?php
+        }
+}
+
+/**
  * Gets the theme support arguments passed when registering that support
  *
  * @since 3.1.0
@@ -1927 +1951 @@
  * @access private
  * @since 3.0.0
  * @since 4.3.0 Also removes `header_image_data`.
+ * @since 4.5.0 Also removes custom logo theme mods.
  *
  * @param int $id The attachment id.
  */
@@ -1934 +1959 @@
         $attachment_image = wp_get_attachment_url( $id );
         $header_image     = get_header_image();
         $background_image = get_background_image();
+        $custom_logo_id   = get_theme_mod( 'custom_logo' );
+
+        if ( $custom_logo_id && $custom_logo_id == $id ) {
+                remove_theme_mod( 'custom_logo' );
+                remove_theme_mod( 'header_text' );
+        }
 
         if ( $header_image && $header_image == $attachment_image ) {
                 remove_theme_mod( 'header_image' );