Ticket #25639: 25639.3.diff

src/wp-includes/class-wp.php

@@ -15 +15 @@
          * @access public
          * @var array
          */
-        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');
+        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', 'pretty');
 
         /**
          * Private query variables.

src/wp-includes/default-filters.php

@@ -237 +237 @@
 add_action( 'do_feed_rss',                'do_feed_rss',                             10, 1 );
 add_action( 'do_feed_rss2',               'do_feed_rss2',                            10, 1 );
 add_action( 'do_feed_atom',               'do_feed_atom',                            10, 1 );
+add_action( 'do_feed_as1',                'do_feed_as1',                             10, 1 );
+add_action( 'do_feed_rssjs',              'do_feed_rssjs',                           10, 1 );
 add_action( 'do_pings',                   'do_all_pings',                            10, 1 );
 add_action( 'do_robots',                  'do_robots'                                      );
 add_action( 'set_comment_cookies',        'wp_set_comment_cookies',                  10, 2 );

src/wp-includes/feed.php

@@ -507 +507 @@
                 'rss2' => 'application/rss+xml',
                 'rss-http'  => 'text/xml',
                 'atom' => 'application/atom+xml',
-                'rdf'  => 'application/rdf+xml'
+                'rdf'  => 'application/rdf+xml',
+                'as1'  => 'application/stream+json',
+                'rssjs' => 'application/rss+json'
         );
 
         $content_type = ( !empty($types[$type]) ) ? $types[$type] : 'application/octet-stream';

src/wp-includes/functions.php

@@ -1083 +1083 @@
 }
 
 /**
+ * Load either Activity Streams 1 comment feed or Activity Streams posts feed.
+ *
+ * @since 3.8.0
+ *
+ * @param bool $for_comments True for the comment feed, false for normal feed.
+ */
+function do_feed_as1( $for_comments ) {
+        if ($for_comments)
+                load_template( ABSPATH . WPINC . '/feed-as1-comments.php');
+        else
+                load_template( ABSPATH . WPINC . '/feed-as1.php' );
+}
+
+/**
+ * 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' );
+}
+
+/**
  * Display the robots.txt file content.
  *
  * The echo content should be with usage of the permalinks or for creating the

src/wp-includes/general-template.php

@@ -477 +477 @@
                 case 'comments_rss2_url':
                         $output = get_feed_link('comments_rss2');
                         break;
+                case 'as1_url':
+                        $output = get_feed_link('as1');
+                        break;
+                case 'comments_as1_url':
+                        $output = get_feed_link('comments_as1');
+                        break;
+                case 'rssjs_url':
+                        $output = get_feed_link('rssjs');
+                        break;
+                case 'comments_rssjs_url':
+                        $output = get_feed_link('comments_rssjs');
+                        break;
                 case 'pingback_url':
                         $output = site_url( 'xmlrpc.php' );
                         break;

src/wp-includes/rewrite.php

@@ -743 +743 @@
          * @access private
          * @var array
          */
-        var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom' );
+        var $feeds = array( 'feed', 'rdf', 'rss', 'rss2', 'atom', 'as1', 'rssjs' );
 
         /**
          * Whether permalinks are being used.