sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge similar error strings. 

props pavelevap.
fixes #32327.

git-svn-id: https://develop.svn.wordpress.org/trunk@32471 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dominik Schilling (ocean90) 2015-05-09 18:26:37 +00:00
parent e7d9eda799
commit ff4f261101
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wp-admin/includes/class-wp-press-this.php
View File

@ -280,9 +280,9 @@ class WP_Press_This {
unlink( $source_tmp_file ); unlink( $source_tmp_file );
} else if ( is_wp_error( $source_tmp_file ) ) { } else if ( is_wp_error( $source_tmp_file ) ) {
$source_content = new WP_Error( 'upload-error', sprintf( __( 'Error: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) ); $source_content = new WP_Error( 'upload-error', sprintf( __( 'ERROR: %s' ), sprintf( __( 'Could not download the source URL (native error: %s).' ), $source_tmp_file->get_error_message() ) ) );
} else if ( ! file_exists( $source_tmp_file ) ) { } else if ( ! file_exists( $source_tmp_file ) ) {
$source_content = new WP_Error( 'no-local-file', sprintf( __( 'Error: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) ); $source_content = new WP_Error( 'no-local-file', sprintf( __( 'ERROR: %s' ), __( 'Could not save or locate the temporary download file for the source URL.' ) ) );
} }
return $source_content; return $source_content;

3
src/wp-includes/atomlib.php
View File

@ -130,7 +130,8 @@ class AtomParser {
if($this->debug) $this->content .= $data; if($this->debug) $this->content .= $data;
if(!xml_parse($parser, $data, feof($fp))) { if(!xml_parse($parser, $data, feof($fp))) {
trigger_error(sprintf(__('XML error: %s at line %d')."\n", /* translators: 1: error message, 2: line number */
trigger_error(sprintf(__('XML Error: %1$s at line %2$s')."\n",
xml_error_string(xml_get_error_code($parser)), xml_error_string(xml_get_error_code($parser)),
xml_get_current_line_number($parser))); xml_get_current_line_number($parser)));
$ret = false; $ret = false;