Changeset 10754

Timestamp:

05/14/2016 04:48:29 AM (10 years ago)

Author:

boonebgorges

Message:

Default no_grav avatars should be thumb-sized when appropriate.

mystery-man-50.jpg should be served when:

• A 'thumb' is requested, and the thumb width set in the config is 50 pixels or less, or
• An avatar with a width of 50 or less is requested.

Props r0z.
Fixes #7056.

Location:

trunk

Files:

• src/bp-core/bp-core-avatars.php (modified) (1 diff)
• tests/phpunit/testcases/core/avatars.php (modified) (1 diff)

trunk/src/bp-core/bp-core-avatars.php

@@ -1866 +1866 @@
         // Use the local default image.
         } elseif ( 'local' === $type ) {
-                $avatar = buddypress()->plugin_url . 'bp-core/images/mystery-man.jpg';
+                $size = '';
+                if (
+                        ( isset( $params['type'] ) && 'thumb' === $params['type'] && bp_core_avatar_thumb_width() <= 50 ) ||
+                        ( isset( $params['width'] ) && $params['width'] <= 50 )
+                ) {
+
+                        $size = '-50';
+                }
+
+                $avatar = buddypress()->plugin_url . "bp-core/images/mystery-man{$size}.jpg";
 
         // Use Gravatar's mystery person as fallback.
         } else {
-                $avatar = '//www.gravatar.com/avatar/00000000000000000000000000000000?d=mm&amp;s=' . bp_core_avatar_full_width();
+                $size = '';
+                if ( isset( $params['type'] ) && 'thumb' === $params['type'] ) {
+                        $size = bp_core_avatar_thumb_width();
+                } else {
+                        $size = bp_core_avatar_full_width();
+                }
+                $avatar = '//www.gravatar.com/avatar/00000000000000000000000000000000?d=mm&amp;s=' . $size;
         }
 

trunk/tests/phpunit/testcases/core/avatars.php

@@ -315 +315 @@
                 return $types;
         }
+
+        /**
+         * @group BP7056
+         */
+        public function test_no_grav_default_should_respect_thumb_type() {
+                $found = bp_core_fetch_avatar( array(
+                        'item_id' => 12345,
+                        'object' => 'user',
+                        'type' => 'thumb',
+                        'no_grav' => true,
+                        'html' => false,
+                ) );
+
+                $this->assertContains( 'mystery-man-50.jpg', $found );
+        }
+
+        /**
+         * @group BP7056
+         */
+        public function test_no_grav_default_should_return_thumb_avatar_for_small_enough_width() {
+                $found = bp_core_fetch_avatar( array(
+                        'item_id' => 12345,
+                        'object' => 'user',
+                        'type' => 'full',
+                        'width' => '50',
+                        'no_grav' => true,
+                        'html' => false,
+                ) );
+
+                $this->assertContains( 'mystery-man-50.jpg', $found );
+        }
+
+        /**
+         * @group BP7056
+         */
+        public function test_no_grav_default_should_return_full_avatar_for_thumb_when_thumb_width_is_too_wide() {
+                add_filter( 'bp_core_avatar_thumb_width', array( $this, 'filter_thumb_width' ) );
+                $found = bp_core_fetch_avatar( array(
+                        'item_id' => 12345,
+                        'object' => 'user',
+                        'type' => 'thumb',
+                        'no_grav' => true,
+                        'html' => false,
+                ) );
+                remove_filter( 'bp_core_avatar_thumb_width', array( $this, 'filter_thumb_width' ) );
+
+                $this->assertContains( 'mystery-man.jpg', $found );
+        }
+
+        public function filter_thumb_width() {
+                return 51;
+        }
 }