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

PDF Images: Avoid a PHP Warning when attempting to process a file without an extension. 

Props chandrapatel for initial patch.
Merges [39580] to the 4.7 branch.
Fixes #39195.

Built from https://develop.svn.wordpress.org/branches/4.7@39607


git-svn-id: http://core.svn.wordpress.org/branches/4.7@39547 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dion Hulse 2016-12-16 05:39:32 +00:00
parent db72974122
commit b24993e4cd
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -146,10 +146,10 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
try {
$this->image = new Imagick();
$file_parts = pathinfo( $this->file );
$file_extension = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
$filename = $this->file;
if ( 'pdf' == strtolower( $file_parts['extension'] ) ) {
if ( 'pdf' == $file_extension ) {
$filename = $this->pdf_setup();
}

2
wp-includes/version.php
View File

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