WordPress 3.4

[autoinstalls/wordpress.git] / wp-includes / feed.php

diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 34d8652b20d4a80f464d4c9dfd109054cfccfb8d..988f6b22c6505aa02761653112e7bbb1e69cb010 100644 (file)
--- 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 ) {
        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");
                        }
                }
                                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(
        $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'])
                );
                . $host
                . stripslashes($_SERVER['REQUEST_URI'])
                );