Changeset 4928

Timestamp:

02/23/2007 08:18:30 AM (18 years ago)

Author:

ryan

Message:

Atom comments feed. First pass. Props kurtmckee and rob1n. fixes #1785

Location:

trunk/wp-includes

Files:

• feed-atom-comments.php (added)
• functions.php (modified) (2 diffs)
• general-template.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -945 +945 @@
     $feed = preg_replace('/^_+/', '', $feed);
 
-    if ($feed == '' || $feed == 'feed')
+    if ( $feed == '' || $feed == 'feed' )
         $feed = 'rss2';
-
+    
     $for_comments = false;
-    if ( 1 != get_query_var('withoutcomments') && ( is_singular() || get_query_var('withcomments') == 1 || $feed == 'comments-rss2' ) ) {
-        $feed = 'rss2';
-        $for_comments = true;   
-    }
+
+    if ( is_singular() || get_query_var('withcomments') == 1 )
+        $for_comments = true;
+
+     if ( false !== strpos($feed, 'comments-') ) {
+        $for_comments = true;
+        $feed = str_replace('comments-', '', $feed);
+     }
+
+     if ( get_query_var('withoutcomments') == 1 )
+        $for_comments = false;
 
     $hook = 'do_feed_' . $feed;
@@ -974 +981 @@
 }
 
-function do_feed_atom() {
-    load_template(ABSPATH . WPINC . '/feed-atom.php');
+function do_feed_atom($for_comments) {
+    if ($for_comments) {
+        load_template(ABSPATH . WPINC . '/feed-atom-comments.php');
+    } else {
+        load_template(ABSPATH . WPINC . '/feed-atom.php');
+    }
 }
 

trunk/wp-includes/general-template.php

@@ -100 +100 @@
             $output = get_feed_link('atom');
             break;
+        case 'comments_atom_url':
+            $output = get_feed_link('comments_atom');
         case 'comments_rss2_url':
             $output = get_feed_link('comments_rss2');