diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-06-10 14:08:54 +0000 |
| commit | 310940b824eff4a116dcd72ccd339bb602021981 (patch) | |
| tree | 19f6efc7b30b9456eebc26d578c5dc7e125bb6e7 /wp-includes/link-template.php | |
| parent | 616f7399dc4c4f7c56951c7b87a7aa91b3e690a3 (diff) | |
| download | wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.gz wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.tar.xz wordpress-mu-310940b824eff4a116dcd72ccd339bb602021981.zip | |
Merge with branches/2.5 in WordPress, revision 8066
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@1324 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/link-template.php')
| -rw-r--r-- | wp-includes/link-template.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 74da3e7..92f57e4 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -184,7 +184,7 @@ function get_attachment_link($id = false) { else $name = $object->post_name; if (strpos($parentlink, '?') === false) - $link = trailingslashit($parentlink) . $name . '/'; + $link = user_trailingslashit( trailingslashit($parentlink) . $name ); } if (! $link ) { @@ -402,7 +402,7 @@ function get_tag_feed_link($tag_id, $feed = '') { $feed_link = 'feed'; else $feed_link = "feed/$feed"; - $link = $link . user_trailingslashit($feed_link, 'feed'); + $link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed'); } $link = apply_filters('tag_feed_link', $link, $feed); |