Changeset 9360

Timestamp:

01/15/2015 08:41:50 PM (10 years ago)

Author:

boonebgorges

Message:

Parse arguments correctly in bp_register_member_type().

Custom labels were not being properly set due to a logic error in the
function.

Props Offereins.
See #6125.

Location:

trunk

Files:

• src/bp-members/bp-members-functions.php (modified) (2 diffs)
• tests/phpunit/testcases/members/types.php (modified) (1 diff)

trunk/src/bp-members/bp-members-functions.php

@@ -2480 +2480 @@
     ), 'register_member_type' );
 
-    $type = (object) $r;
-
     // Store the post type name as data in the object (not just as the array key).
-    $type->name = $member_type;
+    $r['name'] = $member_type;
 
     // Make sure the relevant labels have been filled in.
-    $default_name = isset( $r['labels']['name'] ) ? $r['labels']['name'] : ucfirst( $type->name );
+    $default_name = isset( $r['labels']['name'] ) ? $r['labels']['name'] : ucfirst( $r['name'] );
     $r['labels'] = array_merge( array(
         'name'          => $default_name,
@@ -2492 +2490 @@
     ), $r['labels'] );
 
-    $bp->members->types[ $member_type ] = $type;
+    $bp->members->types[ $member_type ] = $type = (object) $r;
 
     /**

trunk/tests/phpunit/testcases/members/types.php

@@ -31 +31 @@
             $this->assertSame( 'Foo', $label );
         }
+    }
+
+    /**
+     * @ticket BP6125
+     */
+    public function test_bp_register_member_type_should_respect_custom_name_label() {
+        $object = bp_register_member_type( 'foo', array(
+            'labels' => array(
+                'name' => 'Bar',
+            ),
+        ) );
+
+        // 'singular_name' falls back on 'name'.
+        $this->assertSame( 'Bar', $object->labels['name'] );
+        $this->assertSame( 'Bar', $object->labels['singular_name'] );
+    }
+
+    /**
+     * @ticket BP6125
+     */
+    public function test_bp_register_member_type_should_respect_custom_singular_name_label() {
+        $object = bp_register_member_type( 'foo', array(
+            'labels' => array(
+                'singular_name' => 'Bar',
+            ),
+        ) );
+
+        // 'name' is set to upper-case version of member type name.
+        $this->assertSame( 'Foo', $object->labels['name'] );
+        $this->assertSame( 'Bar', $object->labels['singular_name'] );
     }