sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Drew Jaynes 2016-05-30 02:13:57 +00:00
parent a66277f245
commit 8e79f0fb3d
3 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-includes/class-wp-image-editor-gd.php
View File

@ -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. * @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'. * Accepts an integer (bytes), or a shorthand string notation, such as '256M'.
*/ */
// Set artificially high because GD uses uncompressed images in memory $image_memory_limit = apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT );
@ini_set( '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 ) ); $this->image = @imagecreatefromstring( file_get_contents( $this->file ) );

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

@ -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 ); 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 */ /** 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 $image_memory_limit = apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT );
@ini_set( '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 { try {
$this->image = new Imagick( $this->file ); $this->image = new Imagick( $this->file );

8
src/wp-includes/deprecated.php
View File

@ -3175,8 +3175,12 @@ function wp_load_image( $file ) {
if ( ! function_exists('imagecreatefromstring') ) if ( ! function_exists('imagecreatefromstring') )
return __('The GD image library is not installed.'); return __('The GD image library is not installed.');
// Set artificially high because GD uses uncompressed images in memory /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
@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 );
$image = imagecreatefromstring( file_get_contents( $file ) ); $image = imagecreatefromstring( file_get_contents( $file ) );
if ( !is_resource( $image ) ) if ( !is_resource( $image ) )