X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/bf5c68485ef07868ad0a91168ecd0092af7661ae..refs/tags/wordpress-3.4:/wp-includes/feed.php?ds=sidebyside

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 34d8652b..988f6b22 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -424,7 +424,7 @@ function atom_enclosure() {
 	foreach ( (array) get_post_custom() as $key => $val ) {
 		if ($key == 'enclosure') {
 			foreach ( (array) $val as $enc ) {
-				$enclosure = split("\n", $enc);
+				$enclosure = explode("\n", $enc);
 				echo apply_filters('atom_enclosure', '<link href="' . trim(htmlspecialchars($enclosure[0])) . '" rel="enclosure" length="' . trim($enclosure[1]) . '" type="' . trim($enclosure[2]) . '" />' . "\n");
 			}
 		}
@@ -489,8 +489,7 @@ function self_link() {
 	$host = @parse_url(home_url());
 	$host = $host['host'];
 	echo esc_url(
-		'http'
-		. ( (isset($_SERVER['https']) && $_SERVER['https'] == 'on') ? 's' : '' ) . '://'
+		( is_ssl() ? 'https' : 'http' ) . '://'
 		. $host
 		. stripslashes($_SERVER['REQUEST_URI'])
 		);