From eff3b8925b9c501551d983b356fa709fc161cbce Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 19 Jan 2015 08:26:24 +0000
Subject: [PATCH] Display correct title in Archives widget if the type of
 archive was changed using the 'widget_archives_dropdown_args' filter.

props floriansimeth for initial patch.
fixes #31024.
Built from https://develop.svn.wordpress.org/trunk@31241


git-svn-id: http://core.svn.wordpress.org/trunk@31222 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/default-widgets.php | 30 +++++++++++++++++++++++++-----
 wp-includes/version.php         |  2 +-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/wp-includes/default-widgets.php b/wp-includes/default-widgets.php
index 180e0744d9..b21ffa3f03 100644
--- a/wp-includes/default-widgets.php
+++ b/wp-includes/default-widgets.php
@@ -287,8 +287,6 @@ class WP_Widget_Archives extends WP_Widget {
 		if ( $d ) {
 ?>
 		<select name="archive-dropdown" onchange='document.location.href=this.options[this.selectedIndex].value;'>
-			<option value=""><?php esc_attr_e( 'Select Month' ); ?></option>
-
 			<?php
 			/**
 			 * Filter the arguments for the Archives widget drop-down.
@@ -299,12 +297,34 @@ class WP_Widget_Archives extends WP_Widget {
 			 *
 			 * @param array $args An array of Archives widget drop-down arguments.
 			 */
-			wp_get_archives( apply_filters( 'widget_archives_dropdown_args', array(
+			$dropdown_args = apply_filters( 'widget_archives_dropdown_args', array(
 				'type'            => 'monthly',
 				'format'          => 'option',
 				'show_post_count' => $c
-			) ) );
-?>
+			) );
+
+			switch ( $dropdown_args['type'] ) {
+				case 'yearly':
+					$label = __( 'Select Year' );
+					break;
+				case 'monthly':
+					$label = __( 'Select Month' );
+					break;
+				case 'daily':
+					$label = __( 'Select Day' );
+					break;
+				case 'weekly':
+					$label = __( 'Select Week' );
+					break;
+				default:
+					$label = __( 'Select Post' );
+					break;
+			}
+			?>
+
+			<option value=""><?php echo esc_attr( $label ); ?></option>
+			<?php wp_get_archives( $dropdown_args ); ?>
+
 		</select>
 <?php
 		} else {
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 1fd2928f85..04db1595de 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31240';
+$wp_version = '4.2-alpha-31241';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.