Wordpress 4.6

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

diff --git a/wp-admin/includes/image.php b/wp-admin/includes/image.php
index 139d40507052d31a7c9239ec626efd97f3478635..4d9e07692186706d6fe4b52595fcd4df1fb847d9 100644 (file)
--- a/wp-admin/includes/image.php
+++ b/wp-admin/includes/image.php
@@ -28,7 +28,7 @@ function wp_crop_image( $src, $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h, $s
                $src_file = get_attached_file( $src );
 
                if ( ! file_exists( $src_file ) ) {
-                       // If the file doesn't exist, attempt a url fopen on the src link.
+                       // If the file doesn't exist, attempt a URL fopen on the src link.
                        // This can occur with certain file replication plugins.
                        $src = _load_image_to_edit_path( $src, 'full' );
                } else {
@@ -107,10 +107,10 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
                }
 
                /**
-                * Filter the image sizes automatically generated when uploading an image.
+                * Filters the image sizes automatically generated when uploading an image.
                 *
                 * @since 2.9.0
-                * @since 4.4.0 The `$metadata` argument was addeed
+                * @since 4.4.0 Added the `$metadata` argument.
                 *
                 * @param array $sizes    An associative array of image sizes.
                 * @param array $metadata An associative array of image metadata: width, height, file.
@@ -174,7 +174,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
                                        'post_content' => '',
                                );
                                /**
-                                * Filter the parameters for the attachment thumbnail creation.
+                                * Filters the parameters for the attachment thumbnail creation.
                                 *
                                 * @since 3.9.0
                                 *
@@ -199,7 +199,7 @@ function wp_generate_attachment_metadata( $attachment_id, $file ) {
        }
 
        /**
-        * Filter the generated attachment meta data.
+        * Filters the generated attachment meta data.
         *
         * @since 2.1.0
         *
@@ -337,7 +337,7 @@ function wp_read_image_metadata( $file ) {
        }
 
        /**
-        * Filter the image types to check for exif data.
+        * Filters the image types to check for exif data.
         *
         * @since 2.5.0
         *
@@ -408,14 +408,16 @@ function wp_read_image_metadata( $file ) {
                }
        }
 
-       foreach ( $meta as &$value ) {
-               if ( is_string( $value ) ) {
-                       $value = wp_kses_post( $value );
+       foreach ( $meta['keywords'] as $key => $keyword ) {
+               if ( ! seems_utf8( $keyword ) ) {
+                       $meta['keywords'][ $key ] = utf8_encode( $keyword );
                }
        }
 
+       $meta = wp_kses_post_deep( $meta );
+
        /**
-        * Filter the array of meta data read from an image's exif data.
+        * Filters the array of meta data read from an image's exif data.
         *
         * @since 2.5.0
         * @since 4.4.0 The `$iptc` parameter was added.
@@ -463,7 +465,7 @@ function file_is_displayable_image($path) {
        }
 
        /**
-        * Filter whether the current image is displayable in the browser.
+        * Filters whether the current image is displayable in the browser.
         *
         * @since 2.5.0
         *
@@ -504,7 +506,7 @@ function load_image_to_edit( $attachment_id, $mime_type, $size = 'full' ) {
        }
        if ( is_resource($image) ) {
                /**
-                * Filter the current image being loaded for editing.
+                * Filters the current image being loaded for editing.
                 *
                 * @since 2.9.0
                 *
@@ -540,7 +542,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
        if ( $filepath && file_exists( $filepath ) ) {
                if ( 'full' != $size && ( $data = image_get_intermediate_size( $attachment_id, $size ) ) ) {
                        /**
-                        * Filter the path to the current image.
+                        * Filters the path to the current image.
                         *
                         * The filter is evaluated for all image sizes except 'full'.
                         *
@@ -554,7 +556,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
                }
        } elseif ( function_exists( 'fopen' ) && function_exists( 'ini_get' ) && true == ini_get( 'allow_url_fopen' ) ) {
                /**
-                * Filter the image URL if not in the local filesystem.
+                * Filters the image URL if not in the local filesystem.
                 *
                 * The filter is only evaluated if fopen is enabled on the server.
                 *
@@ -568,7 +570,7 @@ function _load_image_to_edit_path( $attachment_id, $size = 'full' ) {
        }
 
        /**
-        * Filter the returned path or URL of the current image.
+        * Filters the returned path or URL of the current image.
         *
         * @since 2.9.0
         *