Changeset 1255

Timestamp:

05/10/2004 07:51:50 AM (22 years ago)

Author:

saxmatt

Message:

wfw:commentRSS and E_ALL fix to blog-header.

Location:

trunk

Files:

• wp-blog-header.php (modified) (1 diff)
• wp-includes/template-functions-comment.php (modified) (1 diff)
• wp-rss2.php (modified) (2 diffs)

trunk/wp-blog-header.php

@@ -90 +90 @@
 
         // Support for Conditional GET
-        $client_last_modified = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-        $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+        if (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) $client_last_modified = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
+        else $client_last_modified = false;
+        if (isset($_SERVER['HTTP_IF_NONE_MATCH'])) $client_etag = stripslashes($_SERVER['HTTP_IF_NONE_MATCH']);
+        else $client_etag = false;
 
         if ( ($client_last_modified && $client_etag) ?

trunk/wp-includes/template-functions-comment.php

@@ -217 +217 @@
 
 function comments_rss_link($link_text='Comments RSS', $commentsrssfilename = 'wp-commentsrss2.php') {
+        $url = comments_rss($commentsrssfilename);
+        echo "<a href='$url'>$link_text</a>";
+}
+
+function comments_rss($commentsrssfilename = 'wp-commentsrss2.php') {
         global $id;
         global $querystring_start, $querystring_equal, $querystring_separator;
 
         if ('' != get_settings('permalink_structure')) {
-                $url = trailingslashit(get_permalink()) . 'rss2/';
+                $url = trailingslashit(get_permalink()) . 'feed/';
         } else {
                 $url = get_settings('siteurl') . '/' . $commentsrssfilename.$querystring_start.'p'.$querystring_equal.$id;
         }
-
-        echo "<a href='$url'>$link_text</a>";
+        return $url;
 }
 

trunk/wp-rss2.php

@@ -15 +15 @@
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->
 <rss version="2.0" 
-        xmlns:content="http://purl.org/rss/1.0/modules/content/">
+        xmlns:content="http://purl.org/rss/1.0/modules/content/"
+        xmlns:wfw="http://wellformedweb.org/CommentAPI/"
+>
 
 <channel>
@@ -39 +41 @@
                 <content:encoded><![CDATA[<?php the_content('', 0, '') ?>]]></content:encoded>
 <?php endif; ?>
-                
+                <wfw:commentRSS><?php echo comments_rss(); ?></wfw:commentRSS>
         </item>
         <?php $items_count++; if (($items_count == get_settings('posts_per_rss')) && empty($m)) { break; } } } ?>