From 6ddbf3c8bdd42d437ccd0490e6e478049ca4236c Mon Sep 17 00:00:00 2001
From: Lance Willett <nanobar@gmail.com>
Date: Sat, 1 Nov 2014 03:26:21 +0000
Subject: [PATCH] Twenty Fourteen: Make featured content in Customizer
 contextual to the front page.

Props celloexpressions, fixes #29578.

Built from https://develop.svn.wordpress.org/trunk@30143


git-svn-id: http://core.svn.wordpress.org/trunk@30143 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyfourteen/inc/customizer.php | 7 ++++---
 wp-includes/version.php                             | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wp-content/themes/twentyfourteen/inc/customizer.php b/wp-content/themes/twentyfourteen/inc/customizer.php
index bd5367747d..78a667f08a 100644
--- a/wp-content/themes/twentyfourteen/inc/customizer.php
+++ b/wp-content/themes/twentyfourteen/inc/customizer.php
@@ -37,12 +37,13 @@ function twentyfourteen_customize_register( $wp_customize ) {
 
 	// Add the featured content section in case it's not already there.
 	$wp_customize->add_section( 'featured_content', array(
-		'title'       => __( 'Featured Content', 'twentyfourteen' ),
-		'description' => sprintf( __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
+		'title'           => __( 'Featured Content', 'twentyfourteen' ),
+		'description'     => sprintf( __( 'Use a <a href="%1$s">tag</a> to feature your posts. If no posts match the tag, <a href="%2$s">sticky posts</a> will be displayed instead.', 'twentyfourteen' ),
 			esc_url( add_query_arg( 'tag', _x( 'featured', 'featured content default tag slug', 'twentyfourteen' ), admin_url( 'edit.php' ) ) ),
 			admin_url( 'edit.php?show_sticky=1' )
 		),
-		'priority'    => 130,
+		'priority'        => 130,
+		'active_callback' => 'is_front_page',
 	) );
 
 	// Add the featured content layout setting and control.
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 514cdbe3ea..8282f593ff 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30142';
+$wp_version = '4.1-alpha-30143';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.