X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/76aea3697c6043c1613370f172395b4f65ee71f0..67ba21ec17b4640df9bbe7701072d10ab2b05b63:/wp-includes/feed.php
diff --git a/wp-includes/feed.php b/wp-includes/feed.php
index 11ff42bc..02263564 100644
--- a/wp-includes/feed.php
+++ b/wp-includes/feed.php
@@ -165,7 +165,7 @@ function the_content_rss($more_link_text='(more...)', $stripteaser=0, $more_file
if ( $cut && !$encode_html )
$encode_html = 2;
if ( 1== $encode_html ) {
- $content = wp_specialchars($content);
+ $content = esc_html($content);
$cut = 0;
} elseif ( 0 == $encode_html ) {
$content = make_url_footnote($content);
@@ -223,9 +223,11 @@ function the_permalink_rss() {
* @package WordPress
* @subpackage Feed
* @since unknown
+ *
+ * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
*/
-function comment_guid() {
- echo get_comment_guid();
+function comment_guid($comment_id = null) {
+ echo get_comment_guid($comment_id);
}
/**
@@ -235,10 +237,11 @@ function comment_guid() {
* @subpackage Feed
* @since unknown
*
+ * @param int|object $comment_id Optional comment object or id. Defaults to global comment object.
* @return bool|string false on failure or guid for comment on success.
*/
-function get_comment_guid() {
- global $comment;
+function get_comment_guid($comment_id = null) {
+ $comment = get_comment($comment_id);
if ( !is_object($comment) )
return false;
@@ -252,7 +255,7 @@ function get_comment_guid() {
* @since 1.5.0
*/
function comment_link() {
- echo get_comment_link();
+ echo esc_url( get_comment_link() );
}
/**
@@ -306,7 +309,7 @@ function comment_text_rss() {
* @package WordPress
* @subpackage Feed
* @since 2.1.0
- * @uses apply_filters()
+ * @uses apply_filters()
*
* @param string $type Optional, default is 'rss'. Either 'rss', 'atom', or 'rdf'.
* @return string All of the post categories for displaying in the feed.
@@ -333,11 +336,11 @@ function get_the_category_rss($type = 'rss') {
foreach ( $cat_names as $cat_name ) {
if ( 'rdf' == $type )
- $the_list .= "\n\t\t\n";
+ $the_list .= "\t\t\n";
elseif ( 'atom' == $type )
- $the_list .= sprintf( '', attribute_escape( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), attribute_escape( $cat_name ) );
+ $the_list .= sprintf( '', esc_attr( apply_filters( 'get_bloginfo_rss', get_bloginfo( 'url' ) ) ), esc_attr( $cat_name ) );
else
- $the_list .= "\n\t\t\n";
+ $the_list .= "\t\t\n";
}
return apply_filters('the_category_rss', $the_list, $type);
@@ -394,15 +397,19 @@ function html_type_rss() {
* @uses get_post_custom() To get the current post enclosure metadata.
*/
function rss_enclosure() {
- global $post;
- if ( !empty($post->post_password) && (!isset($_COOKIE['wp-postpass_'.COOKIEHASH]) || $_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+ if ( post_password_required() )
return;
- foreach (get_post_custom() as $key => $val) {
+ foreach ( (array) get_post_custom() as $key => $val) {
if ($key == 'enclosure') {
- foreach ((array)$val as $enc) {
- $enclosure = split("\n", $enc);
- echo apply_filters('rss_enclosure', '' . "\n");
+ foreach ( (array) $val as $enc ) {
+ $enclosure = explode("\n", $enc);
+
+ //only get the the first element eg, audio/mpeg from 'audio/mpeg mpga mp2 mp3'
+ $t = preg_split('/[ \t]/', trim($enclosure[2]) );
+ $type = $t[0];
+
+ echo apply_filters('rss_enclosure', '' . "\n");
}
}
}
@@ -426,13 +433,12 @@ function rss_enclosure() {
* @uses get_post_custom() To get the current post enclosure metadata.
*/
function atom_enclosure() {
- global $post;
- if ( !empty($post->post_password) && ($_COOKIE['wp-postpass_'.COOKIEHASH] != $post->post_password) )
+ if ( post_password_required() )
return;
- foreach (get_post_custom() as $key => $val) {
+ foreach ( (array) get_post_custom() as $key => $val ) {
if ($key == 'enclosure') {
- foreach ((array)$val as $enc) {
+ foreach ( (array) $val as $enc ) {
$enclosure = split("\n", $enc);
echo apply_filters('atom_enclosure', '' . "\n");
}
@@ -495,10 +501,61 @@ 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 esc_url(
+ 'http'
+ . ( (isset($_SERVER['https']) && $_SERVER['https'] == 'on') ? 's' : '' ) . '://'
+ . $host
+ . stripslashes($_SERVER['REQUEST_URI'])
+ );
+}
+
+/**
+ * Return the content type for specified feed type.
+ *
+ * @package WordPress
+ * @subpackage Feed
+ * @since 2.8.0
+ */
+function feed_content_type( $type = '' ) {
+ if ( empty($type) )
+ $type = get_default_feed();
+
+ $types = array(
+ 'rss' => 'application/rss+xml',
+ 'rss2' => 'application/rss+xml',
+ 'rss-http' => 'text/xml',
+ 'atom' => 'application/atom+xml',
+ 'rdf' => 'application/rdf+xml'
+ );
+
+ $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
+
+ return apply_filters( 'feed_content_type', $content_type, $type );
}
-?>
\ No newline at end of file
+/**
+ * Build SimplePie object based on RSS or Atom feed from URL.
+ *
+ * @since 2.8
+ *
+ * @param string $url URL to retrieve feed
+ * @return WP_Error|SimplePie WP_Error object on failure or SimplePie object on success
+ */
+function fetch_feed($url) {
+ require_once (ABSPATH . WPINC . '/class-feed.php');
+
+ $feed = new SimplePie();
+ $feed->set_feed_url($url);
+ $feed->set_cache_class('WP_Feed_Cache');
+ $feed->set_file_class('WP_SimplePie_File');
+ $feed->set_cache_duration(apply_filters('wp_feed_cache_transient_lifetime', 43200));
+ $feed->init();
+ $feed->handle_content_type();
+
+ if ( $feed->error() )
+ return new WP_Error('simplepie-error', $feed->error());
+
+ return $feed;
+}