Ticket #13847: 13847.2.diff

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', '256M' ) );
 
         $needed_dirs = array();
         $to = trailingslashit($to);

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', '256M' ) );
         $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', '256M' ) );
         $img = load_image_to_edit($post_id, $post->post_mime_type);
 
         if ( !is_resource($img) ) {