From c821bc7ca21681ded5a4ffd81e0d48166b3e6e9f Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Thu, 2 Dec 2010 03:19:14 +0000
Subject: [PATCH] The name of the standard post format is now Standard (might
 offer ability to change Default). fixes #15582

git-svn-id: https://develop.svn.wordpress.org/trunk@16679 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/includes/meta-boxes.php |  2 +-
 wp-includes/post.php             | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index 0f6e3fe338..0973f0bcc3 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -245,7 +245,7 @@ function post_format_meta_box( $post, $box ) {
 			$post_formats[0][] = $post_format;
 	?>
 	<div id="post-formats-select">
-		<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0"><?php _e('Default'); ?></label>
+		<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> /> <label for="post-format-0"><?php _e('Standard'); ?></label>
 		<?php foreach ( $post_formats[0] as $format ) : ?>
 		<br /><input type="radio" name="post_format" class="post-format" id="post-format-<?php echo esc_attr( $format ); ?>" value="<?php echo esc_attr( $format ); ?>" <?php checked( $post_format, $format ); ?> /> <label for="post-format-<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
 		<?php endforeach; ?><br />
diff --git a/wp-includes/post.php b/wp-includes/post.php
index 100ef7aa16..51b14b4c8f 100644
--- a/wp-includes/post.php
+++ b/wp-includes/post.php
@@ -528,7 +528,7 @@ function set_post_format( $post, $format ) {
 
 	if ( !empty($format) ) {
 		$format = sanitize_key($format);
-		$empty_formats = array( 'post', 'default' );
+		$empty_formats = array( 'post', 'standard' );
 		if ( in_array( $format, $empty_formats ) )
 			$format = '';
 		else
@@ -5053,16 +5053,16 @@ function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
  */
 function get_post_format_strings() {
 	$strings = array(
-		'default' => _x( 'Default', 'Post format' ), // Special case. any value that evals to false will be considered default
-		'aside'   => _x( 'Aside',   'Post format' ),
-		'chat'    => _x( 'Chat',    'Post format' ),
-		'gallery' => _x( 'Gallery', 'Post format' ),
-		'link'    => _x( 'Link',    'Post format' ),
-		'image'   => _x( 'Image',   'Post format' ),
-		'quote'   => _x( 'Quote',   'Post format' ),
-		'status'  => _x( 'Status',  'Post format' ),
-		'video'   => _x( 'Video',   'Post format' ),
-		'audio'   => _x( 'Audio',   'Post format' ),
+		'standard' => _x( 'Standard', 'Post format' ), // Special case. any value that evals to false will be considered standard
+		'aside'    => _x( 'Aside',    'Post format' ),
+		'chat'     => _x( 'Chat',     'Post format' ),
+		'gallery'  => _x( 'Gallery',  'Post format' ),
+		'link'     => _x( 'Link',     'Post format' ),
+		'image'    => _x( 'Image',    'Post format' ),
+		'quote'    => _x( 'Quote',    'Post format' ),
+		'status'   => _x( 'Status',   'Post format' ),
+		'video'    => _x( 'Video',    'Post format' ),
+		'audio'    => _x( 'Audio',    'Post format' ),
 	);
 	return $strings;
 }