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

Add translator commment.

Props ramiy.
Fixes #34573.
Built from https://develop.svn.wordpress.org/trunk@35546


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

diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 4254abfd01..c7404924f1 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -1091,12 +1091,20 @@ function get_trackback_url() {
  *                     for the result instead.
  */
 function trackback_url( $deprecated_echo = true ) {
-	if ( $deprecated_echo !== true )
-		_deprecated_argument( __FUNCTION__, '2.5', __('Use <code>get_trackback_url()</code> instead if you do not want the value echoed.') );
-	if ( $deprecated_echo )
+	if ( true !== $deprecated_echo ) {
+		_deprecated_argument( __FUNCTION__, '2.5',
+			/* translators: %s: get_trackback_url() */
+			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+				'<code>get_trackback_url()</code>'
+			)
+		);
+	}
+
+	if ( $deprecated_echo ) {
 		echo get_trackback_url();
-	else
+	} else {
 		return get_trackback_url();
+	}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index b84edefa20..3bd0514710 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-beta3-35545';
+$wp_version = '4.4-beta3-35546';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.