From defb5bbf43b74ccc4f2e4b42ee1c3ea6f8b706e9 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 18 Sep 2015 18:24:24 +0000
Subject: [PATCH] Don't use `<code>` in translation strings in
 `options-general.php`.

Props ramiy, SergeyBiryukov.
Fixes #31852.

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


git-svn-id: http://core.svn.wordpress.org/trunk@34258 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/options-general.php | 19 ++++++++++++++++---
 wp-includes/version.php      |  2 +-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/wp-admin/options-general.php b/wp-admin/options-general.php
index e0e5e5f95e..9b86569323 100644
--- a/wp-admin/options-general.php
+++ b/wp-admin/options-general.php
@@ -102,7 +102,12 @@ include( ABSPATH . 'wp-admin/admin-header.php' );
 $new_admin_email = get_option( 'new_admin_email' );
 if ( $new_admin_email && $new_admin_email != get_option('admin_email') ) : ?>
 <div class="updated inline">
-<p><?php printf( __('There is a pending change of the admin email to <code>%1$s</code>. <a href="%2$s">Cancel</a>'), esc_html( $new_admin_email ), esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) ) ); ?></p>
+<p><?php
+	printf( __( 'There is a pending change of the admin email to %1$s. <a href="%2$s">Cancel</a>' ),
+		'<code>' . esc_html( $new_admin_email ) . '</code>',
+		esc_url( admin_url( 'options.php?dismiss=new_admin_email' ) )
+	);
+?></p>
 </div>
 <?php endif; ?>
 </td>
@@ -137,9 +142,17 @@ if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
 <?php echo wp_timezone_choice($tzstring); ?>
 </select>
 
-	<span id="utc-time"><?php printf(__('<abbr title="Coordinated Universal Time">UTC</abbr> time is <code>%s</code>'), date_i18n($timezone_format, false, 'gmt')); ?></span>
+	<span id="utc-time"><?php
+		printf( __( '<abbr title="Coordinated Universal Time">UTC</abbr> time is %s' ),
+			'<code>' . date_i18n( $timezone_format, false, 'gmt' ) . '</code>'
+		);
+	?></span>
 <?php if ( get_option('timezone_string') || !empty($current_offset) ) : ?>
-	<span id="local-time"><?php printf(__('Local time is <code>%1$s</code>'), date_i18n($timezone_format)); ?></span>
+	<span id="local-time"><?php
+		printf( __( 'Local time is %1$s' ),
+			'<code>' . date_i18n( $timezone_format ) . '</code>'
+		);
+	?></span>
 <?php endif; ?>
 <p class="description" id="timezone-description"><?php _e( 'Choose a city in the same timezone as you.' ); ?></p>
 <?php if ($check_zone_info && $tzstring) : ?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 52e4bef4e1..00e9f6cf86 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-34293';
+$wp_version = '4.4-alpha-34294';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.