Changeset 6745

Timestamp:

11/29/2017 12:46:17 AM (3 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.

Location:

trunk/src/includes

Files:

• common/ajax.php (modified) (1 diff)
• common/template.php (modified) (2 diffs)
• replies/template.php (modified) (2 diffs)
• search/template.php (modified) (2 diffs)
• users/template.php (modified) (1 diff)

trunk/src/includes/common/ajax.php

@@ -33 +33 @@
         global $wp;
 
-        $base_url = home_url( trailingslashit( $wp->request ), ( is_ssl() ? 'https' : 'http' ) );
+        $ssl      = is_ssl() ? 'https' : 'http';
+        $url      = trailingslashit( $wp->request );
+        $base_url = home_url( $url, $ssl );
         $ajaxurl  = add_query_arg( array( 'bbp-ajax' => 'true' ), $base_url );
 

trunk/src/includes/common/template.php

@@ -2054 +2054 @@
         // Pretty permalinks
         if ( bbp_use_pretty_urls() ) {
+
+            // Run through home_url()
             $url = trailingslashit( bbp_get_root_url() . bbp_get_view_slug() ) . $view;
             $url = user_trailingslashit( $url );
@@ -2306 +2308 @@
         // Do we want to include a link to home?
         if ( ! empty( $r['include_home'] ) || empty( $r['home_text'] ) ) {
-            $crumbs[] = '<a href="' . trailingslashit( home_url() ) . '" class="bbp-breadcrumb-home">' . $r['home_text'] . '</a>';
+            $crumbs[] = '<a href="' . esc_url( home_url() ) . '" class="bbp-breadcrumb-home">' . $r['home_text'] . '</a>';
         }
 

trunk/src/includes/replies/template.php

@@ -459 +459 @@
         // Don't include pagination if on first page
         if ( 1 >= $reply_page ) {
-            $url = trailingslashit( $topic_url ) . $reply_hash;
+            $url = user_trailingslashit( $topic_url ) . $reply_hash;
 
         // Include pagination
@@ -466 +466 @@
             // Pretty permalinks
             if ( bbp_use_pretty_urls() ) {
-                $url = trailingslashit( $topic_url ) . trailingslashit( bbp_get_paged_slug() ) . trailingslashit( $reply_page ) . $reply_hash;
+                $url = trailingslashit( $topic_url ) . trailingslashit( bbp_get_paged_slug() ) . $reply_page;
+                $url = user_trailingslashit( $url ) . $reply_hash;
 
             // Yucky links

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

trunk/src/includes/users/template.php

@@ -549 +549 @@
             }
 
+            // Run through home_url()
             $url = trailingslashit( bbp_get_root_url() . bbp_get_user_slug() ) . $user_nicename;
             $url = user_trailingslashit( $url );