Changeset 10412

Timestamp:

12/17/2015 08:47:19 PM (11 years ago)

Author:

imath

Message:

Fix a typo in the bp_activity_set_post_type_tracking_args() function

Add a unit test to check activity tracking arguments are added the same way to the post type when setting them within register_post_type() or using the bp_activity_set_post_type_tracking_args()

Props danbrellis

Fixes #6777

Location:

trunk

Files:

• src/bp-activity/bp-activity-functions.php (modified) (1 diff)
• tests/phpunit/testcases/activity/functions.php (modified) (1 diff)

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

@@ -423 +423 @@
                 if ( ! empty( $args[ $label_type ] ) ) {
                         $wp_post_types[ $post_type ]->labels->{$label_type} = $args[ $label_type ];
-                        unset( $args[ $post_type ] );
+                        unset( $args[ $label_type ] );
                 }
         }

trunk/tests/phpunit/testcases/activity/functions.php

@@ -1086 +1086 @@
                 unset( $bp->activity->actions->blogs->new_page );
                 $bp->activity->track = array();
+        }
+
+        /**
+         * @group bp_activity_set_post_type_tracking_args
+         * @group activity_tracking
+         */
+        public function test_bp_activity_set_post_type_tracking_args_check_post_type_global() {
+                $labels = array(
+                        'bp_activity_admin_filter' => 'New Foo',
+                        'bp_activity_front_filter' => 'Foos',
+                );
+
+                $bp_activity_args = array(
+                        'action_id'    => 'new_foo',
+                        'contexts'     => array( 'activity' ),
+                        'position'     => 40,
+                );
+
+                register_post_type( 'foo', array(
+                        'labels'      => $labels,
+                        'supports'    => array( 'buddypress-activity' ),
+                        'bp_activity' => $bp_activity_args
+                ) );
+
+                $register_bp_activity = get_post_type_object( 'foo' )->bp_activity;
+                _unregister_post_type( 'foo' );
+
+                register_post_type( 'foo', array(
+                        'label'       => 'foo',
+                        'supports'    => array( 'buddypress-activity' ),
+                ) );
+
+                bp_activity_set_post_type_tracking_args( 'foo', $labels + $bp_activity_args );
+
+                $set_bp_activity = get_post_type_object( 'foo' )->bp_activity;
+                _unregister_post_type( 'foo' );
+
+                $this->assertSame( $set_bp_activity, $register_bp_activity );
         }