Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-25 06:14:58 +02:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary echo(), add translator comment.

Browse Source 
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
This commit is contained in:
Sergey Biryukov 2015-04-02 19:01:27 +00:00
parent 942c6a9edc
commit c691addc73
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wp-admin/link-parse-opml.php
View File

@ -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

2
wp-includes/version.php
View File

@ -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.