X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/699231ae09f7057a4d0000cdf32e50a3df6a04ca..refs/tags/wordpress-3.4.2-scripts:/wp-admin/includes/image-edit.php
diff --git a/wp-admin/includes/image-edit.php b/wp-admin/includes/image-edit.php
index e871ae5e..d2d6dc2c 100644
--- a/wp-admin/includes/image-edit.php
+++ b/wp-admin/includes/image-edit.php
@@ -67,7 +67,7 @@ function wp_image_editor($post_id, $msg = false) {
-
+
@@ -192,49 +192,11 @@ function wp_image_editor($post_id, $msg = false) {
-
+
post_mime_type, array(400, 400) );
if ( !is_resource($img) )
@@ -421,7 +382,7 @@ function wp_restore_image($post_id) {
$file = get_attached_file($post_id);
$backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
$restored = false;
- $msg = '';
+ $msg = new stdClass;
if ( !is_array($backup_sizes) ) {
$msg->error = __('Cannot load image metadata.');
@@ -430,7 +391,7 @@ function wp_restore_image($post_id) {
$parts = pathinfo($file);
$suffix = time() . rand(100, 999);
- $default_sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
+ $default_sizes = get_intermediate_image_sizes();
if ( isset($backup_sizes['full-orig']) && is_array($backup_sizes['full-orig']) ) {
$data = $backup_sizes['full-orig'];
@@ -492,10 +453,10 @@ function wp_restore_image($post_id) {
}
function wp_save_image($post_id) {
- $return = '';
+ $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) ) {
@@ -550,7 +511,7 @@ function wp_save_image($post_id) {
// 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);
@@ -602,7 +563,7 @@ function wp_save_image($post_id) {
$meta['hwstring_small'] = "height='$uheight' width='$uwidth'";
if ( $success && ('nothumb' == $target || 'all' == $target) ) {
- $sizes = apply_filters( 'intermediate_image_sizes', array('large', 'medium', 'thumbnail') );
+ $sizes = get_intermediate_image_sizes();
if ( 'nothumb' == $target )
$sizes = array_diff( $sizes, array('thumbnail') );
}
@@ -664,4 +625,3 @@ function wp_save_image($post_id) {
$return->msg = esc_js( __('Image saved') );
return $return;
}
-