Ticket #37516: combined-37516.diff

src/wp-content/themes/twentyseventeen/functions.php

@@ -55 +55 @@
 
         add_image_size( 'twentyseventeen-thumbnail-avatar', 100, 100, true );
 
+        add_theme_support( 'custom-title-tagline' );
+
         // Set the default content width.
         $GLOBALS['content_width'] = 525;
 

src/wp-content/themes/twentyseventeen/inc/customizer.php

@@ -19 +19 @@
 
         $wp_customize->selective_refresh->add_partial( 'blogname', array(
                 'selector' => '.site-title a',
+                'settings' => array( 'blogname', 'header_display_title' ),
                 'render_callback' => 'twentyseventeen_customize_partial_blogname',
         ) );
         $wp_customize->selective_refresh->add_partial( 'blogdescription', array(
                 'selector' => '.site-description',
+                'settings' => array( 'blogdescription', 'header_display_tagline' ),
                 'render_callback' => 'twentyseventeen_customize_partial_blogdescription',
         ) );
 
@@ -163 +165 @@
  * @return void
  */
 function twentyseventeen_customize_partial_blogname() {
-        bloginfo( 'name' );
+        if ( get_option( 'header_display_title' ) ) {
+                bloginfo( 'name' );
+        }
 }
 
 /**
@@ -175 +179 @@
  * @return void
  */
 function twentyseventeen_customize_partial_blogdescription() {
-        bloginfo( 'description' );
+        if ( get_option( 'header_display_tagline' ) ) {
+                bloginfo( 'description' );
+        }
 }
 
 /**

src/wp-content/themes/twentyseventeen/template-parts/header/site-branding.php

@@ -16 +16 @@
 
                 <div class="site-branding-text">
                         <?php if ( is_front_page() ) : ?>
-                                <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+                                <?php if ( get_option( 'header_display_title' ) ) : ?>
+                                        <h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
+                                <?php endif; ?>
                         <?php else : ?>
-                                <p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
+                                <?php if ( get_option( 'header_display_title' ) ) : ?>
+                                        <p class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></p>
+                                <?php endif; ?>
                         <?php endif; ?>
 
                         <?php
@@ -26 +30 @@
 
                         if ( $description || is_customize_preview() ) :
                         ?>
-                                <p class="site-description"><?php echo $description; ?></p>
+                                <?php if ( get_option( 'header_display_tagline' ) ) : ?>
+                                        <p class="site-description"><?php echo $description; ?></p>
+                                <?php endif; ?>
                         <?php endif; ?>
                 </div><!-- .site-branding-text -->
 

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

@@ -4455 +4455 @@
                         'section'    => 'title_tagline',
                 ) );
 
+                // Theme feature for enabling and disabling the site title
+                if ( current_theme_supports( 'custom-title-tagline', 'display-title' ) ) {
+                        $this->add_setting( 'header_display_title', array(
+                                'default'    => get_option( 'header_display_title' ) || get_option( 'blogname' ),
+                                'type'       => 'option',
+                                'capability' => 'manage_options',
+                                'transport'         => 'postMessage',
+                                'sanitize_callback' => 'absint',
+                        ) );
+
+                        $this->add_control( 'header_display_title', array(
+                                'label'    => __( 'Display Site Title' ),
+                                'section'  => 'title_tagline',
+                                'settings' => 'header_display_title',
+                                'type'     => 'checkbox',
+                        ) );
+                }
+
+                // Theme feature for enabling and disabling the site tagline
+                if ( current_theme_supports( 'custom-title-tagline', 'display-tagline' ) ) {
+                        $this->add_setting( 'header_display_tagline', array(
+                                'default'    => get_option( 'header_display_tagline' ) || get_option( 'blogdescrption' ),
+                                'type'       => 'option',
+                                'capability' => 'manage_options',
+                                'transport'         => 'postMessage',
+                                'sanitize_callback' => 'absint',
+                        ) );
+
+                        $this->add_control( 'header_display_tagline', array(
+                                'label'    => __( 'Display Site Tagline' ),
+                                'section'  => 'title_tagline',
+                                'settings' => 'header_display_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' ) ) {
+                if ( ! current_theme_supports( 'custom-header', 'header-text' ) && ! current_theme_supports( 'custom-title-tagline' ) ) {
                         $this->add_setting( 'header_text', array(
                                 'theme_supports'    => array( 'custom-logo', 'header-text' ),
                                 'default'           => 1,

src/wp-includes/theme.php

@@ -2419 +2419 @@
 
                                 return false;
                         }
+
+                        break;
+
+                case 'custom-title-tagline':
+                        if ( ! is_array( $args ) ) {
+                                $args = array(
+                                        0 => array(),
+                                );
+                        }
+
+                        $defaults = array(
+                                'display-title'          => true,
+                                'display-tagline'        => true,
+                        );
+
+                        $args[0] = wp_parse_args( array_intersect_key( $args[0], $defaults ), $defaults );
+
+                        break;
+
         }
 
         $_wp_theme_features[ $feature ] = $args;