WordPress 4.7.1-scripts

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor.php

diff --git a/wp-includes/class-wp-image-editor.php b/wp-includes/class-wp-image-editor.php
index 5b6f4ac9a02d223021e2441eba77329f86758b13..cc991eb8a9cb9e059a20728c31fc476944b18161 100644 (file)
--- a/wp-includes/class-wp-image-editor.php
+++ b/wp-includes/class-wp-image-editor.php
@@ -237,7 +237,7 @@ abstract class WP_Image_Editor {
        public function set_quality( $quality = null ) {
                if ( null === $quality ) {
                        /**
-                        * Filter the default image compression quality setting.
+                        * Filters the default image compression quality setting.
                         *
                         * Applies only during initial editor instantiation, or when set_quality() is run
                         * manually without the `$quality` argument.
@@ -253,7 +253,7 @@ abstract class WP_Image_Editor {
 
                        if ( 'image/jpeg' == $this->mime_type ) {
                                /**
-                                * Filter the JPEG compression quality for backward-compatibility.
+                                * Filters the JPEG compression quality for backward-compatibility.
                                 *
                                 * Applies only during initial editor instantiation, or when set_quality() is run
                                 * manually without the `$quality` argument.
@@ -276,7 +276,7 @@ abstract class WP_Image_Editor {
                        }
                }
 
-               // Allow 0, but squash to 1 due to identical images in GD, and for backwards compatibility.
+               // Allow 0, but squash to 1 due to identical images in GD, and for backward compatibility.
                if ( 0 === $quality ) {
                        $quality = 1;
                }
@@ -333,7 +333,7 @@ abstract class WP_Image_Editor {
                // If not, choose a default instead.
                if ( ! $this->supports_mime_type( $mime_type ) ) {
                        /**
-                        * Filter default mime type prior to getting the file extension.
+                        * Filters default mime type prior to getting the file extension.
                         *
                         * @see wp_get_mime_types()
                         *
@@ -346,12 +346,8 @@ abstract class WP_Image_Editor {
                }
 
                if ( $filename ) {
-                       $ext = '';
-                       $info = pathinfo( $filename );
-                       $dir  = $info['dirname'];
-
-                       if ( isset( $info['extension'] ) )
-                               $ext = $info['extension'];
+                       $dir = pathinfo( $filename, PATHINFO_DIRNAME );
+                       $ext = pathinfo( $filename, PATHINFO_EXTENSION );
 
                        $filename = trailingslashit( $dir ) . wp_basename( $filename, ".$ext" ) . ".{$new_ext}";
                }
@@ -375,9 +371,8 @@ abstract class WP_Image_Editor {
                if ( ! $suffix )
                        $suffix = $this->get_suffix();
 
-               $info = pathinfo( $this->file );
-               $dir  = $info['dirname'];
-               $ext  = $info['extension'];
+               $dir  = pathinfo( $this->file, PATHINFO_DIRNAME );
+               $ext  = pathinfo( $this->file, PATHINFO_EXTENSION );
 
                $name = wp_basename( $this->file, ".$ext" );
                $new_ext = strtolower( $extension ? $extension : $ext );