Changeset 17749

Timestamp:

04/28/2011 04:25:36 PM (13 years ago)

Author:

westi

Message:

Introduce WP_MAX_MEMORY_LIMIT constant for the high memory limit we set when image processing and unzipping.
Ensure it is always filterable by plugins as well as configurable in wp-config
Fixes #13847 props hakre

Location:

trunk

Files:

• wp-admin/admin.php (modified) (1 diff)
• wp-admin/includes/file.php (modified) (1 diff)
• wp-admin/includes/image-edit.php (modified) (2 diffs)
• wp-includes/default-constants.php (modified) (1 diff)
• wp-includes/media.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/wp-admin/admin.php

@@ -107 +107 @@
 
 if ( current_user_can( 'manage_options' ) )
-    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', '256M' ) );
+    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 
 do_action('admin_init');

trunk/wp-admin/includes/file.php

@@ -519 +519 @@
 
     // Unzip can use a lot of memory, but not this much hopefully
-    @ini_set('memory_limit', '256M');
+    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 
     $needed_dirs = array();

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

@@ -392 +392 @@
 function stream_preview_image($post_id) {
     $post = get_post($post_id);
-    @ini_set('memory_limit', '256M');
+    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
     $img = load_image_to_edit( $post_id, $post->post_mime_type, array(400, 400) );
 
@@ -497 +497 @@
     $success = $delete = $scaled = $nocrop = false;
     $post = get_post($post_id);
-    @ini_set('memory_limit', '256M');
+    @ini_set( 'memory_limit', apply_filters( 'admin_memory_limit', WP_MAX_MEMORY_LIMIT ) );
     $img = load_image_to_edit($post_id, $post->post_mime_type);
 

trunk/wp-includes/default-constants.php

@@ -25 +25 @@
     }
 
+    if ( ! defined( 'WP_MAX_MEMORY_LIMIT' ) ) {
+        define( 'WP_MAX_MEMORY_LIMIT', '256M' );
+    }
+
     /**
      * The $blog_id global, which you can change in the config allows you to create a simple

trunk/wp-includes/media.php

@@ -251 +251 @@
 
     // Set artificially high because GD uses uncompressed images in memory
-    @ini_set('memory_limit', '256M');
+    @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
     $image = imagecreatefromstring( file_get_contents( $file ) );
 

trunk/wp-settings.php

@@ -21 +21 @@
 require( ABSPATH . WPINC . '/version.php' );
 
-// Set initial default constants including WP_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
+// Set initial default constants including WP_MEMORY_LIMIT, WP_MAX_MEMORY_LIMIT, WP_DEBUG, WP_CONTENT_DIR and WP_CACHE.
 wp_initial_constants( );