Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-24 13:54:59 +02:00
Code Issues Projects Releases Wiki Activity

Docs: Correct a duplicate filter comment for the image_memory_limit hook to point to the correct file.

Browse Source 
Props bobbingwide.
See #36968.

Built from https://develop.svn.wordpress.org/trunk@37591


git-svn-id: http://core.svn.wordpress.org/trunk@37559 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2016-05-30 02:10:30 +00:00
parent c0302df02f
commit a7c601b74f
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $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-imagick.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
@ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );

2
wp-includes/version.php
View File

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