diff options
| author | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-11-24 17:04:14 +0000 |
|---|---|---|
| committer | donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36> | 2008-11-24 17:04:14 +0000 |
| commit | f3f3886b6ce0f9cdf2a663c450a1ddb8593bd799 (patch) | |
| tree | e4ec667aae78a662485b750905182bf3d39c19ad /wp-includes/feed.php | |
| parent | 23f67568a169dd05954b92d198923850709baae3 (diff) | |
| download | wordpress-mu-f3f3886b6ce0f9cdf2a663c450a1ddb8593bd799.tar.gz wordpress-mu-f3f3886b6ce0f9cdf2a663c450a1ddb8593bd799.tar.xz wordpress-mu-f3f3886b6ce0f9cdf2a663c450a1ddb8593bd799.zip | |
WP Merge with revision 9860
git-svn-id: http://svn.automattic.com/wordpress-mu/branches/2.6@1542 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes/feed.php')
| -rw-r--r-- | wp-includes/feed.php | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/wp-includes/feed.php b/wp-includes/feed.php index 3ff5b9a..7b3138e 100644 --- a/wp-includes/feed.php +++ b/wp-includes/feed.php @@ -495,10 +495,14 @@ function prep_atom_text_construct($data) { * @since 2.5 */ function self_link() { - echo 'http' - . ( $_SERVER['https'] == 'on' ? 's' : '' ) . '://' - . $_SERVER['HTTP_HOST'] - . wp_specialchars(stripslashes($_SERVER['REQUEST_URI']), 1); + $host = @parse_url(get_option('home')); + $host = $host['host']; + echo clean_url( + 'http' + . ( (isset($_SERVER['https']) && $_SERVER['https'] == 'on') ? 's' : '' ) . '://' + . $host + . stripslashes($_SERVER['REQUEST_URI']) + ); } ?> |