Changeset 6745 for trunk/src/includes/search/template.php

Timestamp:

11/29/2017 12:46:17 AM (8 years ago)

Author:

johnjamesjacoby

Message:

URLs: Audit the usage of trailingslashit().

This change ensures that trailing slashes are only used at the end of URLs where they're expected, and avoids adding slashes at the end of URLs when permalinks are configured not to include them.

See #3181.

File:

• trunk/src/includes/search/template.php (modified) (2 diffs)

trunk/src/includes/search/template.php

@@ -203 +203 @@
         // Pretty permalinks
         if ( bbp_use_pretty_urls() ) {
+
+            // Run through home_url()
             $url = bbp_get_root_url() . bbp_get_search_slug();
             $url = user_trailingslashit( $url );
@@ -334 +336 @@
         // Shortcode territory
         if ( is_page() || is_single() ) {
-            $base = trailingslashit( get_permalink() );
+            $base = get_permalink();
 
         // Default search location
         } else {
-            $base = trailingslashit( bbp_get_search_results_url() );
+            $base = bbp_get_search_results_url();
         }
 
         // Add pagination base
-        $base = $base . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
+        $base = trailingslashit( $base ) . user_trailingslashit( bbp_get_paged_slug() . '/%#%/' );
 
     // Unpretty permalinks