Ticket #13847: 13847.3.patch

wp-includes/default-constants.php

@@ -23 +23 @@
                         define('WP_MEMORY_LIMIT', '32M');
                 }
         }
+        
+        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

wp-admin/admin.php

@@ -106 +106 @@
         require(ABSPATH . 'wp-admin/menu.php');
 
 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');
 

wp-admin/includes/file.php

@@ -563 +563 @@
                 return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
 
         // 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();
         $to = trailingslashit($to);

wp-includes/media.php

@@ -250 +250 @@
                 return __('The GD image library is not installed.');
 
         // Set artificially high because GD uses uncompressed images in memory
-        @ini_set('memory_limit', '256M');
+        @ini_set('memory_limit', WP_MAX_MEMORY_LIMIT);
         $image = imagecreatefromstring( file_get_contents( $file ) );
 
         if ( !is_resource( $image ) )

wp-settings.php

@@ -20 +20 @@
 require( ABSPATH . WPINC . '/default-constants.php' );
 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( );
 
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.

wp-admin/includes/image-edit.php

@@ -391 +391 @@
 
 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) );
 
         if ( !is_resource($img) )
@@ -496 +496 @@
         $return = new stdClass;
         $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);
 
         if ( !is_resource($img) ) {