Ticket #37516: poc-37516.2.diff

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

@@ -3757 +3757 @@
                         'section'    => 'title_tagline',
                 ) );
 
+                $this->add_setting( 'header_text_title', array(
+                        'default'    => get_option( 'header_text_title' ) || get_option( 'blogname' ),
+                        'type'       => 'option',
+                        'capability' => 'manage_options',
+                        'transport'         => 'postMessage',
+                        'sanitize_callback' => 'absint',
+
+
+                ) );
+
+                $this->add_control( 'header_text_title', array(
+                        'label'    => __( 'Display Site Title' ),
+                        'section'  => 'title_tagline',
+                        'settings' => 'header_text_title',
+                        'type'     => 'checkbox',
+                ) );
+
                 $this->add_setting( 'blogdescription', array(
                         'default'    => get_option( 'blogdescription' ),
                         'type'       => 'option',
@@ -3768 +3785 @@
                         'section'    => 'title_tagline',
                 ) );
 
+                $this->add_setting( 'header_text_tagline', array(
+                        'default'    => get_option( 'header_text_tagline' ) || get_option( 'blogdescrption' ),
+                        'type'       => 'option',
+                        'capability' => 'manage_options',
+                        'transport'         => 'postMessage',
+                        'sanitize_callback' => 'absint',
+                ) );
+
+                $this->add_control( 'header_text_tagline', array(
+                        'label'    => __( 'Display Site Tagline' ),
+                        'section'  => 'title_tagline',
+                        'settings' => 'header_text_tagline',
+                        'type'     => 'checkbox',
+                ) );
+
                 // 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',
+
+                        $this->add_setting( 'header_text_title', array(
+                                'default'    => get_option( 'header_text_title' ) || get_option( 'blogname' ),
+                                //'type'       => 'option',
+                                //'capability' => 'manage_options',
+                                        'theme_supports'    => array( 'custom-logo', 'header-text' ),
+                                        'sanitize_callback' => 'absint',
+
+                        ) );
+
+                        $this->add_control( 'header_text_title', array(
+                                'label'    => __( 'Display Site Title' ),
+                                'section'  => 'title_tagline',
+                                'settings' => 'header_text_title',
+                                'type'     => 'checkbox',
                         ) );
 
-                        $this->add_control( 'header_text', array(
-                                'label'    => __( 'Display Site Title and Tagline' ),
+                        $this->add_setting( 'header_text_tagline', array(
+                                'default'    => get_option( 'header_text_tagline' ) || get_option( 'blogname' ),
+                                //'type'       => 'option',
+                                //'capability' => 'manage_options',
+                                        'theme_supports'    => array( 'custom-logo', 'header-text' ),
+                                        'sanitize_callback' => 'absint',
+
+                        ) );
+
+                        $this->add_control( 'header_text_tagline', array(
+                                'label'    => __( 'Display Site Tagline' ),
                                 'section'  => 'title_tagline',
-                                'settings' => 'header_text',
+                                'settings' => 'header_text_tagline',
                                 'type'     => 'checkbox',
                         ) );
+
                 }
 
                 $this->add_setting( 'site_icon', array(
@@ -3850 +3903 @@
                         'sanitize_js_callback' => 'maybe_hash_hex_color',
                 ) );
 
-                // Input type: checkbox
-                // With custom value
-                $this->add_control( 'display_header_text', array(
-                        'settings' => 'header_textcolor',
-                        'label'    => __( 'Display Site Title and Tagline' ),
-                        'section'  => 'title_tagline',
-                        'type'     => 'checkbox',
-                        'priority' => 40,
-                ) );
-
                 $this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
                         'label'   => __( 'Header Text Color' ),
                         'section' => 'colors',

src/wp-includes/general-template.php

@@ -3844 +3844 @@
 
         return $settings;
 }
+
+/**
+ * TEMPORARY - this needs a better solution
+ * Used to demonstrate https://core.trac.wordpress.org/ticket/37516 only
+ * apply_filters( 'bloginfo', $output, $show );
+ */
+function filter_bloginfo_header_text( $output, $show ) {
+        if ( 'name' === $show )
+                return ( get_option( 'header_text_title') ? $output : '' );
+        elseif ( 'description' === $show )
+                return ( get_option( 'header_text_tagline' ) ? $output : '' );
+
+
+        return $output;
+}
+
+function add_filter_bloginfo_header_text( $header_name ) {
+        add_filter( 'bloginfo', 'filter_bloginfo_header_text', 10, 2 );
+}
+
+add_action( 'get_header', 'add_filter_bloginfo_header_text' );
+
+function filter_register_blogname_partials( WP_Customize_Manager $wp_customize ) {
+
+    if ( ! isset( $wp_customize->selective_refresh ) ) {
+        return;
+    }
+
+    $wp_customize->selective_refresh->add_partial( 'header_text_title', array(
+        'selector' => '.site-title a',
+        'settings' => array( 'blogname', 'header_text_title' ),
+        'render_callback' => function() {
+            return filter_bloginfo_header_text( get_bloginfo( 'name' ), 'name' );
+        },
+    ) );
+
+    $wp_customize->selective_refresh->add_partial( 'header_text_tagline', array(
+        'selector' => '.site-description',
+        'settings' => array( 'blogdescription', 'header_text_tagline' ),
+        'render_callback' => function() {
+                return filter_bloginfo_header_text( get_bloginfo( 'description' ), 'description' );
+        }
+    ) );
+}
+add_action( 'customize_register', 'filter_register_blogname_partials' );
+ No newline at end of file