WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Image Editor: Merge two error strings. 

Props pavelevap.
See #22623.
Built from https://develop.svn.wordpress.org/trunk@34841


git-svn-id: http://core.svn.wordpress.org/trunk@34806 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-10-05 22:40:25 +00:00
parent ab5ea42aa2
commit 93a5af5753
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/class-wp-image-editor-imagick.php
View File

@ -208,7 +208,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
$size = $this->image->getImageGeometry(); $size = $this->image->getImageGeometry();
} }
catch ( Exception $e ) { catch ( Exception $e ) {
return new WP_Error( 'invalid_image', __('Could not read image size'), $this->file ); return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
} }
} }

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-alpha-34840'; $wp_version = '4.4-alpha-34841';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.