Changeset 36915

Timestamp:

03/09/2016 11:43:49 PM (9 years ago)

Author:

obenland

Message:

Customize: Only add custom logo’s header text control if needed.

Dissolves WP_CustomLogo and adopts a structure similar to custom header and background (See _delete_attachment_theme_mod()).
The option to hide header text only gets added if it’s not already part of custom header, and only if selectors have been registered when theme support for custom logos was declared. Themes can add postMessage support for it as well.

Example:

add_theme_support( 'custom-logo', array(
    'size' => ‘large’,
    'header-text' => array( 'site-title', 'site-description' ),
) );

See #33755.

Location:

trunk

Files:

• src/wp-admin/includes/admin.php (modified) (1 diff)
• src/wp-admin/includes/class-wp-custom-logo.php (deleted)
• src/wp-includes/class-wp-customize-manager.php (modified) (1 diff)
• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/general-template.php (modified) (1 diff)
• src/wp-includes/theme.php (modified) (3 diffs)
• tests/phpunit/tests/image/custom_logo.php (deleted)

trunk/src/wp-admin/includes/admin.php

@@ -73 +73 @@
 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');

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

@@ -1923 +1923 @@
         ) );
 
-        // 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',
             ) );
 

trunk/src/wp-includes/default-filters.php

@@ -372 +372 @@
 // Theme
 add_action( 'wp_loaded', '_custom_header_background_just_in_time' );
+add_action( 'wp_head', '_custom_logo_header_styles' );
 add_action( 'plugins_loaded', '_wp_customize_include' );
 add_action( 'admin_enqueue_scripts', '_wp_customize_loader_settings' );

trunk/src/wp-includes/general-template.php

@@ -881 +881 @@
         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.

trunk/src/wp-includes/theme.php

@@ -1733 +1733 @@
 
 /**
+ * Adds CSS to hide header text for custom logo, based on Customizer setting.
+ *
+ * @since 4.5.0
+ * @access private
+ */
+function _custom_logo_header_styles() {
+    if ( ! current_theme_supports( 'custom-header', 'header-text' ) && 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 id="custom-logo-css" 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
  *
@@ -1928 +1952 @@
  * @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.
@@ -1935 +1960 @@
     $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 ) {