Changes in trunk/wp-admin/includes/image-edit.php [16377:17749]

File:

• trunk/wp-admin/includes/image-edit.php (modified) (4 diffs)

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

@@ -205 +205 @@
             $filepath = apply_filters('load_image_to_edit_filesystempath', path_join( dirname($filepath), $data['file'] ), $post_id, $size);
         }
-    } elseif ( WP_Http_Fopen::test() ) {
+    } elseif ( function_exists('fopen') && function_exists('ini_get') && true == ini_get('allow_url_fopen') ) {
         $filepath = apply_filters('load_image_to_edit_attachmenturl', wp_get_attachment_url($post_id) , $post_id, $size);
     }
@@ -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);
 
@@ -552 +552 @@
     // generate new filename
     $path = get_attached_file($post_id);
-    $path_parts = pathinfo52( $path );
+    $path_parts = pathinfo( $path );
     $filename = $path_parts['filename'];
     $suffix = time() . rand(100, 999);