From c691addc73ab7ba86d6540b2f08c6e4c39098d36 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Thu, 2 Apr 2015 19:01:27 +0000
Subject: [PATCH] Remove unnecessary `echo()`, add translator comment.

props ramiy.
fixes #31873.
Built from https://develop.svn.wordpress.org/trunk@31986


git-svn-id: http://core.svn.wordpress.org/trunk@31965 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/link-parse-opml.php | 11 +++++++----
 wp-includes/version.php      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/wp-admin/link-parse-opml.php b/wp-admin/link-parse-opml.php
index 6197281d86..c1c5e3a33b 100644
--- a/wp-admin/link-parse-opml.php
+++ b/wp-admin/link-parse-opml.php
@@ -74,10 +74,13 @@ $xml_parser = xml_parser_create();
 // Set the functions to handle opening and closing tags
 xml_set_element_handler($xml_parser, "startElement", "endElement");
 
-if (!xml_parse($xml_parser, $opml, true)) {
-	echo(sprintf(__('XML error: %1$s at line %2$s'),
-	xml_error_string(xml_get_error_code($xml_parser)),
-	xml_get_current_line_number($xml_parser)));
+if ( ! xml_parse( $xml_parser, $opml, true ) ) {
+	printf(
+		/* translators: 1: error message, 2: line number */
+		__( 'XML Error: %1$s at line %2$s' ),
+		xml_error_string( xml_get_error_code( $xml_parser ) ),
+		xml_get_current_line_number( $xml_parser )
+	);
 }
 
 // Free up memory used by the XML parser
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9b2fa55915..518fe7a860 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-beta3-31985';
+$wp_version = '4.2-beta3-31986';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.