Changeset 37592

Timestamp:

05/30/2016 02:13:57 AM (10 years ago)

Author:

DrewAPicture

Message:

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.

Location:

trunk/src/wp-includes

Files:

• class-wp-image-editor-gd.php (modified) (1 diff)
• class-wp-image-editor-imagick.php (modified) (1 diff)
• deprecated.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -105 +105 @@
                  *                          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 ) );

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -139 +139 @@
 
                 /** 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 {

trunk/src/wp-includes/deprecated.php

@@ -3176 +3176 @@
                 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 ) );