Changeset 9701

Timestamp:

04/06/2015 03:19:56 PM (10 years ago)

Author:

boonebgorges

Message:

Don't trailingslash the href of subnav items if the 'link' was provided explicitly in bp_core_new_subnav_item().

trailingslashit() is not smart enough to detect links with query params, so
that links can be improperly trailingslashed in some cases. More generally,
it's not the case that all links should be trailingslashed (in particular,
those that do not lead to WP/BP pages), so plugin authors should be responsible
for trailingslashing on their own.

Props pareshradadiya.
See #6353.

Location:

trunk

Files:

• src/bp-core/bp-core-buddybar.php (modified) (2 diffs)
• tests/phpunit/testcases/core/nav.php (modified) (1 diff)

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

@@ -297 +297 @@
     // 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 );
         }
     }
@@ -314 +314 @@
     $subnav_item = array(
         'name'              => $name,
-        'link'              => trailingslashit( $link ),
+        'link'              => $link,
         'slug'              => $slug,
         'css_id'            => $item_css_id,

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

@@ -382 +382 @@
         $this->assertSame( $expected, buddypress()->bp_options_nav['foo-parent']['bar']['link'] );
     }
+
+    /**
+     * @group bp_core_new_subnav_item
+     * @ticket BP6353
+     */
+    public function test_bp_core_new_subnav_item_link_should_not_trailingslash_link_explicit_link() {
+        $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'] );
+    }
 }