Changeset 8243

Timestamp:

04/06/2014 04:20:31 PM (11 years ago)

Author:

boonebgorges

Message:

Ensure bp_get_user_has_avatar() returns false when the default avatar is returned

Necessitated by changes in return values introduced in r7769

See #5380

Props imath

Location:

trunk

Files:

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

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

@@ -1034 +1034 @@
 
     $retval = false;
-    if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default() )
+    if ( bp_core_fetch_avatar( array( 'item_id' => $user_id, 'no_grav' => true, 'html' => false ) ) != bp_core_avatar_default( 'local' ) )
         $retval = true;
 

trunk/tests/testcases/core/avatars.php

@@ -54 +54 @@
         $this->go_to( '/' );
     }
+
+    /**
+     * @group bp_get_user_has_avatar
+     */
+    public function test_bp_get_user_has_avatar_no_avatar_uploaded() {
+        $u = $this->create_user();
+        $this->assertFalse( bp_get_user_has_avatar( $u ) );
+    }
+
+    /**
+     * @group bp_get_user_has_avatar
+     */
+    public function test_bp_get_user_has_avatar_has_avatar_uploaded() {
+        $u = $this->create_user();
+
+        // Fake it
+        add_filter( 'bp_core_fetch_avatar_url', array( $this, 'avatar_cb' ) );
+
+        $this->assertTrue( bp_get_user_has_avatar( $u ) );
+
+        remove_filter( 'bp_core_fetch_avatar_url', array( $this, 'avatar_cb' ) );
+    }
+
+    public function avatar_cb() {
+        return 'foo';
+    }
 }