Changeset 11210

Timestamp:

05/05/2009 10:22:20 PM (15 years ago)

Author:

ryan

Message:

Slashe before query args. Props peaceablewhale. fixes #9515

File:

• trunk/wp-includes/link-template.php (modified) (13 diffs)

trunk/wp-includes/link-template.php

@@ -155 +155 @@
         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 = user_trailingslashit(get_option('home')) . '?p=' . $post->ID;
         return apply_filters('post_link', $permalink, $post, $leavename);
     }
@@ -226 +226 @@
         $link = get_page_uri($id);
         $link = ( $leavename ) ? $pagestruct : str_replace('%pagename%', $link, $pagestruct);
-        $link = get_option('home') . "/$link";
+        $link = user_trailingslashit(get_option('home')) . "$link";
         $link = user_trailingslashit($link, 'page');
     } else {
-        $link = get_option('home') . "/?page_id=$id";
+        $link = user_trailingslashit(get_option('home')) . "?page_id=$id";
     }
 
@@ -270 +270 @@
 
     if (! $link ) {
-        $link = get_bloginfo('url') . "/?attachment_id=$id";
+        $link = user_trailingslashit(get_bloginfo('url')) . "?attachment_id=$id";
     }
 
@@ -293 +293 @@
         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', user_trailingslashit(get_option('home')) . '?m=' . $year, $year);
     }
 }
@@ -318 +318 @@
         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', user_trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2), $year, $month);
     }
 }
@@ -348 +348 @@
         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', user_trailingslashit(get_option('home')) . '?m=' . $year . zeroise($month, 2) . zeroise($day, 2), $year, $month, $day);
     }
 }
@@ -383 +383 @@
             $feed = str_replace('comments_', 'comments-', $feed);
 
-        $output = get_option('home') . "/?feed={$feed}";
+        $output = user_trailingslashit(get_option('home')) . "?feed={$feed}";
     }
 
@@ -415 +415 @@
         $type = get_post_field('post_type', $post_id);
         if ( 'page' == $type )
-            $url = get_option('home') . "/?feed=$feed&page_id=$post_id";
+            $url = user_trailingslashit(get_option('home')) . "?feed=$feed&page_id=$post_id";
         else
-            $url = get_option('home') . "/?feed=$feed&p=$post_id";
+            $url = user_trailingslashit(get_option('home')) . "?feed=$feed&p=$post_id";
     }
 
@@ -469 +469 @@
 
     if ( '' == $permalink_structure ) {
-        $link = get_option('home') . "?feed=$feed&author=" . $author_id;
+        $link = user_trailingslashit(get_option('home')) . "?feed=$feed&author=" . $author_id;
     } else {
         $link = get_author_posts_url($author_id);
@@ -513 +513 @@
 
     if ( '' == $permalink_structure ) {
-        $link = trailingslashit( get_option('home') ) . "?feed=$feed&cat=" . $cat_id;
+        $link = user_trailingslashit(get_option('home')) . "?feed=$feed&cat=" . $cat_id;
     } else {
         $link = get_category_link($cat_id);
@@ -552 +552 @@
 
     if ( '' == $permalink_structure ) {
-        $link = get_option('home') . "?feed=$feed&tag=" . $tag->slug;
+        $link = user_trailingslashit(get_option('home')) . "?feed=$feed&tag=" . $tag->slug;
     } else {
         $link = get_tag_link($tag->term_id);
@@ -627 +627 @@
         $feed = get_default_feed();
 
-    $link = get_option('home') . "?s=$search&feed=$feed";
+    $link = user_trailingslashit(get_option('home')) . "?s=$search&feed=$feed";
 
     $link = apply_filters('search_feed_link', $link);
@@ -652 +652 @@
         $feed = get_default_feed();
 
-    $link = get_option('home') . "?s=$search&feed=comments-$feed";
+    $link = user_trailingslashit(get_option('home')) . "?s=$search&feed=comments-$feed";
 
     $link = apply_filters('search_feed_link', $link);