From 8e79f0fb3d03c0ad4bf1fabed0ce7cb2a56b3d01 Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 30 May 2016 02:13:57 +0000 Subject: [PATCH] Docs: Ensure hook and duplicate hook docs directly precede all instances of the `image_memory_limit` filter. Hook docs must directly precede hooks in order for the Code Reference parser to correctly identify them as such. Fixes #36968. git-svn-id: https://develop.svn.wordpress.org/trunk@37592 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/class-wp-image-editor-gd.php | 6 ++++-- src/wp-includes/class-wp-image-editor-imagick.php | 9 +++++++-- src/wp-includes/deprecated.php | 8 ++++++-- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/wp-includes/class-wp-image-editor-gd.php b/src/wp-includes/class-wp-image-editor-gd.php index f41a1ed432..96e7bf1dba 100644 --- a/src/wp-includes/class-wp-image-editor-gd.php +++ b/src/wp-includes/class-wp-image-editor-gd.php @@ -104,8 +104,10 @@ class WP_Image_Editor_GD extends WP_Image_Editor { * @param int|string $limit Maximum memory limit to allocate for images. Default WP_MAX_MEMORY_LIMIT. * Accepts an integer (bytes), or a shorthand string notation, such as '256M'. */ - // Set artificially high because GD uses uncompressed images in memory - @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) ); + $image_memory_limit = apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ); + + // Set artificially high because GD uses uncompressed images in memory. + @ini_set( 'memory_limit', $image_memory_limit ); $this->image = @imagecreatefromstring( file_get_contents( $this->file ) ); diff --git a/src/wp-includes/class-wp-image-editor-imagick.php b/src/wp-includes/class-wp-image-editor-imagick.php index 3ab9359038..3d92d39096 100644 --- a/src/wp-includes/class-wp-image-editor-imagick.php +++ b/src/wp-includes/class-wp-image-editor-imagick.php @@ -138,8 +138,13 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor { return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file ); /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ - // Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits - @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) ); + $image_memory_limit = apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ); + + /* + * Even though Imagick uses less PHP memory than GD, set higher limit + * for users that have low PHP.ini limits. + */ + @ini_set( 'memory_limit', $image_memory_limit ); try { $this->image = new Imagick( $this->file ); diff --git a/src/wp-includes/deprecated.php b/src/wp-includes/deprecated.php index f3d3862cd3..fed5fd8cff 100644 --- a/src/wp-includes/deprecated.php +++ b/src/wp-includes/deprecated.php @@ -3175,8 +3175,12 @@ function wp_load_image( $file ) { if ( ! function_exists('imagecreatefromstring') ) return __('The GD image library is not installed.'); - // Set artificially high because GD uses uncompressed images in memory - @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) ); + /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ + $image_memory_limit = apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ); + + // Set artificially high because GD uses uncompressed images in memory. + @ini_set( 'memory_limit', $image_memory_limit ); + $image = imagecreatefromstring( file_get_contents( $file ) ); if ( !is_resource( $image ) )