Ticket #9515: link-template.php-2.7-trailingslashit.patch

link-template.php

@@ -151 +151 @@
                 $permalink = user_trailingslashit($permalink, 'single');
                 return apply_filters('post_link', $permalink, $post, $leavename);
         } else { // if they're not using the fancy permalink option
-                $permalink = get_option('home') . '/?p=' . $post->ID;
+                $permalink = trailingslashit(get_option('home')) . '?p=' . $post->ID;
                 return apply_filters('post_link', $permalink, $post, $leavename);
         }
 }
@@ -220 +220 @@
         if ( '' != $pagestruct && isset($post->post_status) && 'draft' != $post->post_status ) {
                 $link = get_page_uri($id);
                 $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
-                $link = get_option('home') . "/$link";
+                $link = trailingslashit(get_option('home')) . "$link";
                 $link = user_trailingslashit($link, 'page');
         } else {
-                $link = get_option('home') . "/?page_id=$id";
+                $link = trailingslashit(get_option('home')) . "?page_id=$id";
         }
 
         return apply_filters( '_get_page_link', $link, $id );
@@ -264 +264 @@
         }
 
         if (! $link ) {
-                $link = get_bloginfo('url') . "/?attachment_id=$id";
+                $link = trailingslashit(get_bloginfo('url')) . "?attachment_id=$id";
         }
 
         return apply_filters('attachment_link', $link, $id);
@@ -287 +287 @@
                 $yearlink = str_replace('%year%', $year, $yearlink);
                 return apply_filters('year_link', get_option('home') . user_trailingslashit($yearlink, 'year'), $year);
         } else {
-                return apply_filters('year_link', get_option('home') . '/?m=' . $year, $year);
+                return apply_filters('year_link', trailingslashit(get_option('home')) . '?m=' . $year, $year);
         }
 }
 
@@ -312 +312 @@
                 $monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
                 return apply_filters('month_link', get_option('home') . user_trailingslashit($monthlink, 'month'), $year, $month);
         } else {
-                return apply_filters('month_link', get_option('home') . '/?m=' . $year . zeroise($month, 2), $year, $month);
+                return apply_filters('month_link', trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2), $year, $month);
         }
 }
 
@@ -342 +342 @@
                 $daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
                 return apply_filters('day_link', get_option('home') . user_trailingslashit($daylink, 'day'), $year, $month, $day);
         } else {
-                return apply_filters('day_link', get_option('home') . '/?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
+                return apply_filters('day_link', trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
         }
 }
 
@@ -377 +377 @@
                 if ( false !== strpos($feed, 'comments_') )
                         $feed = str_replace('comments_', 'comments-', $feed);
 
-                $output = get_option('home') . "/?feed={$feed}";
+                $output = trailingslashit(get_option('home')) . "?feed={$feed}";
         }
 
         return apply_filters('feed_link', $output, $feed);
@@ -409 +409 @@
         } else {
                 $type = get_post_field('post_type', $post_id);
                 if ( 'page' == $type )
-                        $url = get_option('home') . "/?feed=$feed&page_id=$post_id";
+                        $url = trailingslashit(get_option('home')) . "?feed=$feed&page_id=$post_id";
                 else
-                        $url = get_option('home') . "/?feed=$feed&p=$post_id";
+                        $url = trailingslashit(get_option('home')) . "?feed=$feed&p=$post_id";
         }
 
         return apply_filters('post_comments_feed_link', $url);
@@ -463 +463 @@
                 $feed = get_default_feed();
 
         if ( '' == $permalink_structure ) {
-                $link = get_option('home') . "?feed=$feed&author=" . $author_id;
+                $link = trailingslashit(get_option('home')) . "?feed=$feed&author=" . $author_id;
         } else {
                 $link = get_author_posts_url($author_id);
                 if ( $feed == get_default_feed() )
@@ -507 +507 @@
         $permalink_structure = get_option('permalink_structure');
 
         if ( '' == $permalink_structure ) {
-                $link = get_option('home') . "?feed=$feed&cat=" . $cat_id;
+                $link = trailingslashit(get_option('home')) . "?feed=$feed&cat=" . $cat_id;
         } else {
                 $link = get_category_link($cat_id);
                 if( $feed == get_default_feed() )
@@ -546 +546 @@
                 $feed = get_default_feed();
 
         if ( '' == $permalink_structure ) {
-                $link = get_option('home') . "?feed=$feed&tag=" . $tag->slug;
+                $link = trailingslashit(get_option('home')) . "?feed=$feed&tag=" . $tag->slug;
         } else {
                 $link = get_tag_link($tag->term_id);
                 if ( $feed == get_default_feed() )
@@ -621 +621 @@
         if ( empty($feed) )
                 $feed = get_default_feed();
 
-        $link = get_option('home') . "?s=$search&feed=$feed";
+        $link = trailingslashit(get_option('home')) . "?s=$search&feed=$feed";
 
         $link = apply_filters('search_feed_link', $link);
 
@@ -646 +646 @@
         if ( empty($feed) )
                 $feed = get_default_feed();
 
-        $link = get_option('home') . "?s=$search&feed=comments-$feed";
+        $link = trailingslashit(get_option('home')) . "?s=$search&feed=comments-$feed";
 
         $link = apply_filters('search_feed_link', $link);