Changeset 6562

Timestamp:

12/04/2012 01:25:08 PM (12 years ago)

Author:

djpaul

Message:

Fix avatar cropping for WordPress 3.5. Fixes #4608 for the 1.6 branch.

File:

• branches/1.6/bp-core/bp-core-avatars.php (modified) (3 diffs)

branches/1.6/bp-core/bp-core-avatars.php

@@ -476 +476 @@
         return true;
 
-    require_once( ABSPATH . '/wp-admin/includes/image.php' );
     require_once( ABSPATH . '/wp-admin/includes/file.php' );
 
@@ -515 +514 @@
 
     // Get image size
-    $size = @getimagesize( $bp->avatar_admin->original['file'] );
+    $size  = @getimagesize( $bp->avatar_admin->original['file'] );
+    $error = false;
 
     // Check image size and shrink if too large
     if ( $size[0] > bp_core_avatar_original_max_width() ) {
-        $thumb = wp_create_thumbnail( $bp->avatar_admin->original['file'], bp_core_avatar_original_max_width() );
-
-        // Check for thumbnail creation errors
-        if ( is_wp_error( $thumb ) ) {
-            bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $thumb->get_error_message() ), 'error' );
+        $editor = wp_get_image_editor( $bp->avatar_admin->original['file'] );
+
+        if ( ! is_wp_error( $editor ) ) {
+            $editor->set_quality( 100 );
+
+            $resized = $editor->resize( bp_core_avatar_original_max_width(), bp_core_avatar_original_max_width(), false );
+            if ( ! is_wp_error( $resized ) )
+                $thumb = $editor->save( $editor->generate_filename() );
+            else
+                $error = $resized;
+
+            // Check for thumbnail creation errors
+            if ( false === $error && is_wp_error( $thumb ) )
+                $error = $thumb;
+
+            if ( false === $error ) {
+                // Thumbnail is good so proceed
+                $bp->avatar_admin->resized = $thumb;
+            }
+
+        } else {
+            $error = $editor;
+        }
+
+        if ( false !== $error ) {
+            bp_core_add_message( sprintf( __( 'Upload Failed! Error was: %s', 'buddypress' ), $error->get_error_message() ), 'error' );
             return false;
         }
-
-        // Thumbnail is good so proceed
-        $bp->avatar_admin->resized = $thumb;
     }
 
@@ -535 +553 @@
         $bp->avatar_admin->image->dir = str_replace( bp_core_avatar_upload_path(), '', $bp->avatar_admin->original['file'] );
     else {
-        $bp->avatar_admin->image->dir = str_replace( bp_core_avatar_upload_path(), '', $bp->avatar_admin->resized );
+        $bp->avatar_admin->image->dir = str_replace( bp_core_avatar_upload_path(), '', $bp->avatar_admin->resized['path'] );
         @unlink( $bp->avatar_admin->original['file'] );
     }