Ticket #32075: 32075.diff

src/wp-admin/admin.php

@@ -138 +138 @@
         require(ABSPATH . 'wp-admin/menu.php');
 
 if ( current_user_can( 'manage_options' ) ) {
-        /**
-         * Filter the maximum memory limit available for administration screens.
-         *
-         * This only applies to administrators, who may require more memory for tasks like updates.
-         * Memory limits when processing images (uploaded or edited by users of any role) are
-         * handled separately.
-         *
-         * The WP_MAX_MEMORY_LIMIT constant specifically defines the maximum memory limit available
-         * when in the administration back-end. The default is 256M, or 256 megabytes of memory.
-         *
-         * @since 3.0.0
-         *
-         * @param string 'WP_MAX_MEMORY_LIMIT' The maximum WordPress memory limit. Default 256M.
-         */
-        @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+        wp_raise_memory_limit( 'admin_memory_limit' );
 }
 
 /**

src/wp-admin/includes/file.php

@@ -546 +546 @@
                 return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
         // Unzip can use a lot of memory, but not this much hopefully
-        /** This filter is documented in wp-admin/admin.php */
-        @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+        wp_raise_memory_limit( 'admin_memory_limit' );
 
         $needed_dirs = array();
         $to = trailingslashit($to);

src/wp-admin/includes/image-edit.php

@@ -557 +557 @@
 function stream_preview_image( $post_id ) {
         $post = get_post( $post_id );
 
-        /** This filter is documented in wp-admin/admin.php */
-        @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+        wp_raise_memory_limit( 'admin_memory_limit' );
 
         $img = wp_get_image_editor( _load_image_to_edit_path( $post_id ) );
 

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

@@ -96 +96 @@
                 if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
                         return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 
-                /**
-                 * Filter the memory limit allocated for image manipulation.
-                 *
-                 * @since 3.5.0
-                 *
-                 * @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 ) );
+                wp_raise_memory_limit( 'image_memory_limit' );
 
                 $this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 

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

@@ -129 +129 @@
                 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 */
                 // 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 ) );
+                wp_raise_memory_limit( 'image_memory_limit' );
 
                 try {
                         $this->image = new Imagick( $this->file );

src/wp-includes/default-constants.php

@@ -26 +26 @@
                 }
         }
 
+        $current_limit     = @ini_get( 'memory_limit' );
+        $current_limit_int = intval( $current_limit );
+
         if ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) ) {
-                define( 'WP_MAX_MEMORY_LIMIT', '256M' );
+                if ( -1 === $current_limit_int || $current_limit_int > 256 ) {
+                        define( 'WP_MAX_MEMORY_LIMIT', $current_limit );
+                } else {
+                        define( 'WP_MAX_MEMORY_LIMIT', '256M' );
+                }
         }
 
         if ( ! isset($blog_id) )
@@ -35 +42 @@
 
         // set memory limits.
         if ( function_exists( 'memory_get_usage' ) ) {
-                $current_limit = @ini_get( 'memory_limit' );
-                $current_limit_int = intval( $current_limit );
                 if ( false !== strpos( $current_limit, 'G' ) )
                         $current_limit_int *= 1024;
                 $wp_limit_int = intval( WP_MEMORY_LIMIT );

src/wp-includes/deprecated.php

@@ -3134 +3134 @@
                 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 ) );
+        wp_raise_memory_limit( 'image_memory_limit' );
         $image = imagecreatefromstring( file_get_contents( $file ) );
 
         if ( !is_resource( $image ) )

src/wp-includes/functions.php

@@ -5166 +5166 @@
         // Strip timezone information
         return preg_replace( '/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted );
 }
+
+/**
+ * WP raise memory limit
+ *
+ * Raises the default memory limit for memory intensive processes.
+ * Only allow filter to raise and not lower the limit.
+ *
+ * @param string $filter Filter name
+ */
+function wp_raise_memory_limit( $filter ) {
+        $current_limit     = WP_MAX_MEMORY_LIMIT;
+        $current_limit_int = intval( $current_limit );
+        $new_limit         = apply_filters( $filter, $current_limit );
+        $new_limit_int     = intval( $new_limit );
+
+        if ( -1 === $new_limit_int || $new_limit_int > $current_limit_int ) {
+                @ini_set( 'memory_limit', $new_limit );
+        } else {
+                @ini_set( 'memory_limit', $current_limit );
+        }
+}