Ticket #6353: link-trailingslash.diff

src/bp-core/bp-core-buddybar.php

@@ -296 +296 @@
 
         // Link was not forced, so create one
         if ( empty( $link ) ) {
-                $link = $parent_url . $slug;
+                $link = trailingslashit( $parent_url . $slug );
 
                 // If this sub item is the default for its parent, skip the slug
                 if ( ! empty( $bp->bp_nav[$parent_slug]['default_subnav_slug'] ) && $slug == $bp->bp_nav[$parent_slug]['default_subnav_slug'] ) {
-                        $link = $parent_url;
+                        $link = trailingslashit( $parent_url );
                 }
         }
 
@@ -313 +313 @@
 
         $subnav_item = array(
                 'name'              => $name,
-                'link'              => trailingslashit( $link ),
+                'link'              => esc_url_raw( $link ),
                 'slug'              => $slug,
                 'css_id'            => $item_css_id,
                 'position'          => $position,

tests/phpunit/testcases/core/nav.php

@@ -341 +341 @@
                 // Clean up
                 $this->set_current_user( $old_current_user );
         }
+
+        /**
+         * @group bp_core_new_subnav_item
+         */
+        public function test_bp_core_new_subnav_item_link_trailing_slash() {
+
+                $link = 'http://example.com/foo/bar/blah/?action=edit&id=30';
+
+                bp_core_new_subnav_item( array(
+                        'name' => 'bar',
+                        'slug' => 'bar',
+                        'parent_slug' => 'foo',
+                        'parent_url' => 'http://example.com/foo/',
+                        'screen_function' => 'foo',
+                        'link' => $link,
+                ) );
+
+                $this->assertSame( $link, buddypress()->bp_options_nav['foo']['bar']['link'] );
+
+        }
 }