<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[26644] trunk/src/wp-includes: Remove the experimental RSS.JS feed, and move it to a plugin for feature development.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26644">26644</a></dd>
<dt>Author</dt> <dd>dd32</dd>
<dt>Date</dt> <dd>2013-12-04 22:23:02 +0000 (Wed, 04 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove the experimental RSS.JS feed, and move it to a plugin for feature development. Unprops pento. See <a href="http://core.trac.wordpress.org/ticket/25639">#25639</a> </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpphp">trunk/src/wp-includes/class-wp.php</a></li>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesrewritephp">trunk/src/wp-includes/rewrite.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesfeedrssjscommentsphp">trunk/src/wp-includes/feed-rssjs-comments.php</a></li>
<li><a href="#trunksrcwpincludesfeedrssjsphp">trunk/src/wp-includes/feed-rssjs.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/class-wp.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/class-wp.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/class-wp.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> * @access public
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type', 'callback');
</del><ins>+ var $public_query_vars = array('m', 'p', 'posts', 'w', 'cat', 'withcomments', 'withoutcomments', 's', 'search', 'exact', 'sentence', 'calendar', 'page', 'paged', 'more', 'tb', 'pb', 'author', 'order', 'orderby', 'year', 'monthnum', 'day', 'hour', 'minute', 'second', 'name', 'category_name', 'tag', 'feed', 'author_name', 'static', 'pagename', 'page_id', 'error', 'comments_popup', 'attachment', 'attachment_id', 'subpost', 'subpost_id', 'preview', 'robots', 'taxonomy', 'term', 'cpage', 'post_type');
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Private query variables.
</span></span></pre></div>
<a id="trunksrcwpincludesdefaultfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/default-filters.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/default-filters.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/default-filters.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -237,7 +237,6 @@
</span><span class="cx"> add_action( 'do_feed_rss', 'do_feed_rss', 10, 1 );
</span><span class="cx"> add_action( 'do_feed_rss2', 'do_feed_rss2', 10, 1 );
</span><span class="cx"> add_action( 'do_feed_atom', 'do_feed_atom', 10, 1 );
</span><del>-add_action( 'do_feed_rssjs', 'do_feed_rssjs', 10, 1 );
</del><span class="cx"> add_action( 'do_pings', 'do_all_pings', 10, 1 );
</span><span class="cx"> add_action( 'do_robots', 'do_robots' );
</span><span class="cx"> add_action( 'set_comment_cookies', 'wp_set_comment_cookies', 10, 2 );
</span></span></pre></div>
<a id="trunksrcwpincludesfeedrssjscommentsphp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/feed-rssjs-comments.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/feed-rssjs-comments.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/feed-rssjs-comments.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -1,127 +0,0 @@
</span><del>-<?php
-/**
- * rss.js Feed Template for displaying rss.js Comments feed.
- *
- * @package WordPress
- * @subpackage Feed
- * @since 3.8.0
- */
-
-$json = new stdClass();
-$json->rss = new stdClass();
-
-$json->rss->version = "2.0";
-$json->rss->channel = new stdClass();
-
-if ( is_singular() )
- $json->rss->channel->title = sprintf( __( 'Comments on: %s' ), get_the_title() );
-elseif ( is_search() )
- $json->rss->channel->title = sprintf( __( 'Comments for %1$s searching on %2$s' ), get_bloginfo( 'name' ), get_search_query() );
-else
- $json->rss->channel->title = sprintf( __( 'Comments for %s' ), get_bloginfo( 'name' ) . get_the_title() );
-
-$json->rss->channel->link = get_bloginfo( 'url' );
-$json->rss->channel->description = get_bloginfo( 'description' );
-$json->rss->channel->language = get_bloginfo( 'language' );
-$json->rss->channel->lastBuildDate = mysql2date( 'D, d M Y H:i:s +0000', get_lastcommentmodified( 'GMT' ), false );
-$json->rss->channel->docs = "http://cyber.law.harvard.edu/rss/rss.html";
-$json->rss->channel->generator = 'WordPress ' . get_bloginfo( 'version' );
-$json->rss->channel->ttl = 15;
-
-$json->rss->channel->item = array();
-
-header( 'Content-Type: ' . feed_content_type( 'rssjs' ) . '; charset=' . get_option( 'blog_charset' ), true );
-
-/*
- * The JSONP callback function to add to the JSON feed
- *
- * @since 3.8.0
- *
- * @param string $callback The JSONP callback function name
- */
-$callback = apply_filters( 'json_feed_callback', get_query_var( 'callback' ) );
-
-if ( ! empty( $callback ) && ! apply_filters( 'json_jsonp_enabled', true ) ) {
- status_header( 400 );
- echo json_encode( array(
- 'code' => 'json_callback_disabled',
- 'message' => 'JSONP support is disabled on this site.'
- ) );
- exit;
-}
-
-if ( preg_match( '/\W/', $callback ) ) {
- status_header( 400 );
- echo json_encode( array(
- 'code' => 'json_callback_invalid',
- 'message' => 'The JSONP callback function is invalid.'
- ) );
- exit;
-}
-
-/*
- * Action triggered prior to the JSON feed being created and sent to the client
- *
- * @since 3.8.0
- */
-do_action( 'json_feed_pre' );
-
-while( have_comments() ) {
- the_comment();
-
- $comment_post = $GLOBALS['post'] = get_post( $comment->comment_post_ID );
-
- $item = new stdClass();
-
- if ( !is_singular() ) {
- $title = get_the_title( $comment_post->ID );
- $item->title = sprintf( __('Comment on %1$s by %2$s') , $title, get_comment_author() );
- } else {
- $item->title = sprintf( __('By: %s'), get_comment_author() );
- }
-
- $item->link = get_comment_link();
- $item->guid = get_comment_guid();
- $item->pubDate = mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false );
-
- if ( post_password_required( $comment_post ) ) {
- $item->description = __( 'Protected Comments: Please enter your password to view comments.' );
- } else {
- $item->description = get_comment_text();
- }
-
- /*
- * The item to be added to the rss.js Comment feed
- *
- * @since 3.8.0
- *
- * @param object $item The rss.js Comment item
- */
- $item = apply_filters( 'comment_rssjs_feed_item', $item );
-
- $json->rss->channel->item[] = $item;
-}
-
-/*
- * The data to be sent to the user as JSON
- *
- * @since 3.8.0
- *
- * @param object $json The JSON data object
- */
-$json = apply_filters( 'comment_rssjs_feed', $json );
-
-$json_str = json_encode( $json );
-
-if ( ! empty( $callback ) ) {
- echo "$callback( $json_str );";
-} else {
- echo $json_str;
-}
-
-/*
- * Action triggered after the JSON feed has been created and sent to the client
- *
- * @since 3.8.0
- */
-do_action( 'json_feed_post' );
</del></span></pre></div>
<a id="trunksrcwpincludesfeedrssjsphp"></a>
<div class="delfile"><h4>Deleted: trunk/src/wp-includes/feed-rssjs.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/feed-rssjs.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/feed-rssjs.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -1,109 +0,0 @@
</span><del>-<?php
-/**
- * rss.js Feed Template for displaying rss.js Posts feed.
- *
- * @package WordPress
- * @subpackage Feed
- * @since 3.8.0
- */
-
-$json = new stdClass();
-$json->rss = new stdClass();
-
-$json->rss->version = "2.0";
-$json->rss->channel = new stdClass();
-
-$json->rss->channel->title = get_bloginfo( 'name' );
-$json->rss->channel->link = get_bloginfo( 'url' );
-$json->rss->channel->description = get_bloginfo( 'description' );
-$json->rss->channel->language = get_bloginfo( 'language' );
-$json->rss->channel->lastBuildDate = mysql2date( 'D, d M Y H:i:s +0000', get_lastpostmodified( 'GMT' ), false );
-$json->rss->channel->docs = "http://cyber.law.harvard.edu/rss/rss.html";
-$json->rss->channel->generator = 'WordPress ' . get_bloginfo( 'version' );
-$json->rss->channel->ttl = 15;
-
-$json->rss->channel->item = array();
-
-header( 'Content-Type: ' . feed_content_type( 'rssjs' ) . '; charset=' . get_option( 'blog_charset' ), true );
-
-/*
- * The JSONP callback function to add to the JSON feed
- *
- * @since 3.8.0
- *
- * @param string $callback The JSONP callback function name
- */
-$callback = apply_filters( 'json_feed_callback', get_query_var( 'callback' ) );
-
-if ( ! empty( $callback ) && ! apply_filters( 'json_jsonp_enabled', true ) ) {
- status_header( 400 );
- echo json_encode( array(
- 'code' => 'json_callback_disabled',
- 'message' => 'JSONP support is disabled on this site.'
- ) );
- exit;
-}
-
-if ( preg_match( '/\W/', $callback ) ) {
- status_header( 400 );
- echo json_encode( array(
- 'code' => 'json_callback_invalid',
- 'message' => 'The JSONP callback function is invalid.'
- ) );
- exit;
-}
-
-/*
- * Action triggered prior to the JSON feed being created and sent to the client
- *
- * @since 3.8.0
- */
-do_action( 'json_feed_pre' );
-
-while( have_posts() ) {
- the_post();
-
- $item = new stdClass();
-
- $item->title = get_the_title();
- $item->link = get_permalink();
- $item->guid = get_the_guid();
- $item->description = get_the_content();
- $item->pubDate = mysql2date( 'D, d M Y H:i:s +0000', get_post_time( 'Y-m-d H:i:s', true ), false );
-
- /*
- * The item to be added to the rss.js Post feed
- *
- * @since 3.8.0
- *
- * @param object $item The rss.js Post item
- */
- $item = apply_filters( 'rssjs_feed_item', $item );
-
- $json->rss->channel->item[] = $item;
-}
-
-/*
- * The data to be sent to the user as JSON
- *
- * @since 3.8.0
- *
- * @param object $json The JSON data object
- */
-$json = apply_filters( 'rssjs_feed', $json );
-
-
-$json_str = json_encode( $json );
-
-if ( ! empty( $callback ) ) {
- echo "$callback( $json_str );";
-} else {
- echo $json_str;
-}
-
-/*
- * Action triggered after the JSON feed has been created and sent to the client
- *
- * @since 3.8.0
- */
-do_action( 'json_feed_post' );
</del></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/feed.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/feed.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/feed.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -507,8 +507,7 @@
</span><span class="cx"> 'rss2' => 'application/rss+xml',
</span><span class="cx"> 'rss-http' => 'text/xml',
</span><span class="cx"> 'atom' => 'application/atom+xml',
</span><del>- 'rdf' => 'application/rdf+xml',
- 'rssjs' => 'application/json',
</del><ins>+ 'rdf' => 'application/rdf+xml'
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/functions.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/functions.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/functions.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -1083,21 +1083,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Load either rssjs comment feed or rssjs posts feed.
- *
- * @since 3.8.0
- *
- * @param bool $for_comments True for the comment feed, false for normal feed.
- */
-function do_feed_rssjs( $for_comments ) {
- if ( $for_comments ) {
- load_template( ABSPATH . WPINC . '/feed-rssjs-comments.php' );
- } else {
- load_template( ABSPATH . WPINC . '/feed-rssjs.php' );
- }
-}
-
-/**
</del><span class="cx"> * Display the robots.txt file content.
</span><span class="cx"> *
</span><span class="cx"> * The echo content should be with usage of the permalinks or for creating the
</span></span></pre></div>
<a id="trunksrcwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/rewrite.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/rewrite.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/rewrite.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> * @access private
</span><span class="cx"> * @var array
</span><span class="cx"> */
</span><del>- var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom', 'rssjs' );
</del><ins>+ var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Whether permalinks are being used.
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-includes/version.php (26643 => 26644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-includes/version.php 2013-12-04 22:08:59 UTC (rev 26643)
+++ trunk/src/wp-includes/version.php 2013-12-04 22:23:02 UTC (rev 26644)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 26294;
</del><ins>+$wp_db_version = 26644;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>