[wp-cvs] wordpress/wp-includes functions.php,1.109,1.110

[Ryan Boren]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30375/wp-includes

Modified Files:
	functions.php 
Log Message:
index.php now handles feeds and trackbacks.

Index: functions.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/functions.php,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** functions.php	31 May 2004 21:34:00 -0000	1.109
--- functions.php	31 May 2004 23:35:32 -0000	1.110
***************
*** 1228,1233 ****
  
      $index = 'index.php';
!     $feedindex = 'wp-feed.php';
!     $trackbackindex = 'wp-trackback.php';
      for ($i = 0; $i < $num_tokens; ++$i) {
               if (0 < $i) {
--- 1228,1233 ----
  
      $index = 'index.php';
!     $feedindex = 'index.php';
!     $trackbackindex = 'index.php';
      for ($i = 0; $i < $num_tokens; ++$i) {
               if (0 < $i) {
***************
*** 1264,1268 ****
                  $post = 1;
                  $trackbackmatch = $match . $trackbackregex;
!                 $trackbackquery = $trackbackindex . '?' . $query;
                  $match = $match . '?([0-9]+)?/?$';
                  $query = $index . '?' . $query . '&page=' . preg_index($num_toks + 1, $matches);
--- 1264,1268 ----
                  $post = 1;
                  $trackbackmatch = $match . $trackbackregex;
!                 $trackbackquery = $trackbackindex . '?' . $query . '&tb=1';
                  $match = $match . '?([0-9]+)?/?$';
                  $query = $index . '?' . $query . '&page=' . preg_index($num_toks + 1, $matches);
***************
*** 1316,1324 ****
      // Site feed
      $sitefeedmatch = 'feed/?([_0-9a-z-]+)?/?$';
!     $sitefeedquery = 'wp-feed.php?feed=' . preg_index(1, $matches);
  
      // Site comment feed
      $sitecommentfeedmatch = 'comments/feed/?([_0-9a-z-]+)?/?$';
!     $sitecommentfeedquery = 'wp-feed.php?feed=' . preg_index(1, $matches) . '&withcomments=1';
  
      // Site page
--- 1316,1324 ----
      // Site feed
      $sitefeedmatch = 'feed/?([_0-9a-z-]+)?/?$';
!     $sitefeedquery = 'index.php?feed=_' . preg_index(1, $matches);
  
      // Site comment feed
      $sitecommentfeedmatch = 'comments/feed/?([_0-9a-z-]+)?/?$';
!     $sitecommentfeedquery = 'index.php?feed=_' . preg_index(1, $matches) . '&withcomments=1';
  
      // Site page
***************
*** 1345,1349 ****
      $author_rewrite = generate_rewrite_rules($author_structure);
  
- 
      // Put them together.
      $rewrite = $site_rewrite + $category_rewrite + $author_rewrite + $post_rewrite;
--- 1345,1348 ----