From 09b9fae4db3218eb21290f80caf493d51188f409 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 5 Nov 2015 23:38:27 +0000
Subject: [PATCH] Remove `<code>` tag from translatable string in
 `the_author()`.

Add translator commment.

Props ramiy.
See #34573.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35509 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/author-template.php | 19 +++++++++++++++----
 wp-includes/version.php         |  2 +-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php
index ad090354fd..54ad8cada1 100644
--- a/wp-includes/author-template.php
+++ b/wp-includes/author-template.php
@@ -56,12 +56,23 @@ function get_the_author($deprecated = '') {
  * @return string|null The author's display name, from get_the_author().
  */
 function the_author( $deprecated = '', $deprecated_echo = true ) {
-	if ( !empty( $deprecated ) )
+	if ( ! empty( $deprecated ) ) {
 		_deprecated_argument( __FUNCTION__, '2.1' );
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '1.5', __('Use <code>get_the_author()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
+	}
+
+	if ( true !== $deprecated_echo ) {
+		_deprecated_argument( __FUNCTION__, '1.5',
+			/* translators: %s: get_the_author() */
+			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+				'<code>get_the_author()</code>'
+			)
+		);
+	}
+
+	if ( $deprecated_echo ) {
 		echo get_the_author();
+	}
+
 	return get_the_author();
 }
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index cdb9903249..b84edefa20 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta3-35544';
+$wp_version = '4.4-beta3-35545';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.