Changeset 11984 for trunk/wp-admin/includes/image-edit.php

Timestamp:

09/30/2009 08:38:32 AM (16 years ago)

Author:

azaozz

Message:

Image Editor: add load and save image filters, fix backup sizes meta, see #10528

File:

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

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

@@ -11 +11 @@
     $meta = wp_get_attachment_metadata($post_id);
     $thumb = image_get_intermediate_size($post_id, 'thumbnail');
+    $sub_sizes = isset($meta['sizes']) && is_array($meta['sizes']);
     $note = '';
 
@@ -16 +17 @@
         $big = max( $meta['width'], $meta['height'] );
     else
-        wp_die( __('Image data does not exist. Please re-upload the image.') );
+        die( __('Image data does not exist. Please re-upload the image.') );
 
     $sizer = $big > 400 ? 400 / $big : 1;
 
     $backup_sizes = get_post_meta( $post_id, '_wp_attachment_backup_sizes', true );
-    $can_restore = !empty($backup_sizes) && isset($backup_sizes['full-orig']);
+    $can_restore = !empty($backup_sizes) && isset($backup_sizes['full-orig'])
+        && $backup_sizes['full-orig']['file'] != basename($meta['file']);
 
 
     // temp convert backup sizes
-    if ( isset($meta['sizes']) && is_array($meta['sizes']) ) {
+    if ( $sub_sizes ) {
         $update = false;
         foreach ( $meta['sizes'] as $name => $val ) {
@@ -46 +48 @@
     }
     // end temp
-
 
     if ( $msg ) {
@@ -169 +170 @@
     </div>
 
-    <?php if ( $thumb ) {
+    <?php if ( $thumb && $sub_sizes ) {
         $thumb_img = wp_constrain_dimensions( $thumb['width'], $thumb['height'], 160, 120 );
     ?>
@@ -212 +213 @@
 }
 
-function load_image_to_edit($post, $size = 'full') {
-    $filename = get_attached_file($post->ID);
-
-    if ( 'full' != $size && ( $data = image_get_intermediate_size($post->ID, $size) ) )
-        $filename = path_join( dirname($filename), $data['file'] );
-
-    switch ( $post->post_mime_type ) {
+function load_image_to_edit($post_id, $mime_type, $size = 'full') {
+    $filepath = get_attached_file($post_id);
+
+    if ( $filepath && file_exists($filepath) ) {
+        if ( 'full' != $size && ( $data = image_get_intermediate_size($post_id, $size) ) )
+            $filepath = path_join( dirname($filepath), $data['file'] );
+    } elseif ( function_exists('fopen') ) {
+        $filepath = wp_get_attachment_url($post_id);
+    }
+
+    $filepath = apply_filters('load_image_to_edit_path', $filepath, $post_id, $size);
+    if ( empty($filepath) )
+        return false;
+
+    switch ( $mime_type ) {
         case 'image/jpeg':
-            $image = imagecreatefromjpeg($filename);
+            $image = imagecreatefromjpeg($filepath);
             break;
         case 'image/png':
-            $image = imagecreatefrompng($filename);
+            $image = imagecreatefrompng($filepath);
             break;
         case 'image/gif':
-            $image = imagecreatefromgif($filename);
+            $image = imagecreatefromgif($filepath);
             break;
         default:
@@ -233 +242 @@
     }
     if ( is_resource($image) ) {
-        $image = apply_filters('load_image_to_edit', $image, $post->ID, $size);
+        $image = apply_filters('load_image_to_edit', $image, $post_id, $size);
         if ( function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
             imagealphablending($image, false);
@@ -242 +251 @@
 }
 
-function wp_stream_image($image, $mime_type, $post_id = 0, $intermediate_size = '') {
-    $image = apply_filters('image_save_pre', $image, $post->ID, $intermediate_size);
+function wp_stream_image($image, $mime_type, $post_id) {
+    $image = apply_filters('image_save_pre', $image, $post_id);
 
     switch ( $mime_type ) {
@@ -260 +269 @@
 }
 
-function wp_save_image_file($filename, $image, $mime_type, $post_id = 0, $intermediate_size = '') {
-    $image = apply_filters('image_save_pre', $image, $post->ID, $intermediate_size);
+function wp_save_image_file($filename, $image, $mime_type, $post_id) {
+    $image = apply_filters('image_save_pre', $image, $post_id);
+    $saved = apply_filters('wp_save_image_file', null, $filename, $image, $mime_type, $post_id);
+    if ( null !== $saved )
+        return $saved;
 
     switch ( $mime_type ) {
@@ -395 +407 @@
     $post = get_post($post_id);
     @ini_set('memory_limit', '256M');
-    $img = load_image_to_edit( $post, array(400, 400) );
+    $img = load_image_to_edit( $post_id, $post->post_mime_type, array(400, 400) );
 
     if ( !is_resource($img) )
@@ -440 +452 @@
             $data = $backup_sizes["$default_size-orig"];
             if ( 'full' == $default_size ) {
-                $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
+                if ( $parts['basename'] != $data['file'] )
+                    $backup_sizes["full-$suffix"] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $parts['basename']);
 
                 $meta['file'] = path_join($parts['dirname'], $data['file']);
@@ -450 +463 @@
                 $restored = update_attached_file($post_id, $meta['file']);
             } else {
-                if ( isset($meta['sizes'][$default_size]) )
+                if ( isset($meta['sizes'][$default_size]) && $meta['sizes'][$default_size]['file'] != $data['file'] )
                     $backup_sizes["$default_size-{$suffix}"] = $meta['sizes'][$default_size];
 
                 $meta['sizes'][$default_size] = $data;
             }
+        } else {
+            unset($meta['sizes'][$default_size]);
         }
     }
@@ -476 +491 @@
     $post = get_post($post_id);
     @ini_set('memory_limit', '256M');
-    $img = load_image_to_edit($post);
+    $img = load_image_to_edit($post_id, $post->post_mime_type);
 
     if ( !is_resource($img) ) {
@@ -550 +565 @@
     }
 
-    if ( 'nothumb' == $target || 'all' == $target || $scaled ) {
-        $tag = !isset($backup_sizes['full-orig']) ? 'full-orig' : "full-$suffix";
-        $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
+    if ( 'nothumb' == $target || 'all' == $target || 'full' == $target || $scaled ) {
+        $tag = false;
+        if ( isset($backup_sizes['full-orig']) ) {
+            if ( $backup_sizes['full-orig']['file'] != $path_parts['basename'] )
+                $tag = "full-$suffix";
+        } else {
+            $tag = 'full-orig';
+        }
+
+        if ( $tag )
+            $backup_sizes[$tag] = array('width' => $meta['width'], 'height' => $meta['height'], 'file' => $path_parts['basename']);
 
         $success = update_attached_file($post_id, $new_path);
@@ -577 +600 @@
     if ( isset($sizes) ) {
         foreach ( $sizes as $size ) {
+            $tag = false;
             if ( isset($meta['sizes'][$size]) ) {
-                $tag = !isset($backup_sizes["$size-orig"]) ? "$size-orig" : "$size-$suffix";
-                $backup_sizes[$tag] = $meta['sizes'][$size];
+                if ( isset($backup_sizes["$size-orig"]) ) {
+                    if ( $backup_sizes["$size-orig"]['file'] != $meta['sizes'][$size]['file'] )
+                        $tag = "$size-$suffix";
+                } else {
+                    $tag = "$size-orig";
+                }
+
+                if ( $tag )
+                    $backup_sizes[$tag] = $meta['sizes'][$size];
             }
 
@@ -596 +627 @@
         update_post_meta( $post_id, '_wp_attachment_backup_sizes', $backup_sizes);
 
-        if ( $target == 'thumbnail' || $target == 'all' ) {
+        if ( $target == 'thumbnail' || $target == 'all' || $target == 'full' ) {
             if ( $thumb = $meta['sizes']['thumbnail'] ) {
                 $file_url = wp_get_attachment_url($post_id);