[wp-cvs] wordpress wp-rss.php, 1.17, 1.18 wp-rss2.php, 1.23, 1.24 wp-rdf.php, 1.17, 1.18 wp-atom.php, 1.10, 1.11

[Michel Valdrighi]

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

Modified Files:
	wp-rss.php wp-rss2.php wp-rdf.php wp-atom.php 
Log Message:
some cleanups, and a quick undefined variable fix

Index: wp-rss2.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss2.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** wp-rss2.php	22 May 2004 05:06:00 -0000	1.23
--- wp-rss2.php	24 May 2004 18:24:12 -0000	1.24
***************
*** 1,15 ****
! <?php 
! if (!isset($feed)) {
      $blog = 1;
      $doing_rss = 1;
      require('wp-blog-header.php');
  }
! $more = 1;
! $charset = get_settings('blog_charset');
! if (!$charset) $charset = 'UTF-8';
  header('Content-type: text/xml', true);
  
  ?>
! <?php echo '<?xml version="1.0" encoding="' . $charset . '"?'.'>'; ?>
  
  <!-- generator="wordpress/<?php echo $wp_version ?>" -->
--- 1,15 ----
! <?php
! 
! if (!isset($feed) || !$feed) {
      $blog = 1;
      $doing_rss = 1;
      require('wp-blog-header.php');
  }
! 
  header('Content-type: text/xml', true);
+ $more = 1;
  
  ?>
! <?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
  
  <!-- generator="wordpress/<?php echo $wp_version ?>" -->

Index: wp-atom.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-atom.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** wp-atom.php	24 May 2004 16:49:19 -0000	1.10
--- wp-atom.php	24 May 2004 18:24:12 -0000	1.11
***************
*** 1,4 ****
! <?php 
! if (! $feed) {
      $blog = 1;
      $doing_rss = 1;
--- 1,5 ----
! <?php
! 
! if (!isset($feed) || !$feed) {
      $blog = 1;
      $doing_rss = 1;

Index: wp-rss.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rss.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wp-rss.php	21 May 2004 22:32:58 -0000	1.17
--- wp-rss.php	24 May 2004 18:24:12 -0000	1.18
***************
*** 1,6 ****
! <?php /* These first lines are the first part of a CafeLog template.
!          In every template you do, you got to copy them before the CafeLog 'loop' */
! if (! $feed) {
!     $blog = 1; // enter your blog's ID
      $doing_rss = 1;
      require('wp-blog-header.php');
--- 1,6 ----
! <?php
! 
! if (!isset($feed) || !$feed) {
!     $blog = 1;
      $doing_rss = 1;
      require('wp-blog-header.php');
***************
*** 8,11 ****
--- 8,12 ----
  
  header('Content-type: text/xml', true);
+ $more = 1;
  
  ?>
***************
*** 24,31 ****
              <title><?php the_title_rss() ?></title>
  <?php
- // we might use this in the future, but not now, that's why it's commented in PHP
- // so that it doesn't appear at all in the RSS
- //          echo "<category>"; the_category_unicode(); echo "</category>";
- $more = 1; 
  if (get_settings('rss_use_excerpt')) {
  ?>
--- 25,28 ----

Index: wp-rdf.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-rdf.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** wp-rdf.php	19 May 2004 10:24:25 -0000	1.17
--- wp-rdf.php	24 May 2004 18:24:12 -0000	1.18
***************
*** 1,11 ****
  <?php /* RDF 1.0 generator, original version by garym at teledyn.com */
! if (! $feed) {
      $blog = 1; // enter your blog's ID
      $doing_rss = 1;
      require('wp-blog-header.php');
  }
- $more = 1;
  
  header('Content-type: application/rdf+xml', true);
  
  add_filter('the_content', 'trim');
--- 1,12 ----
  <?php /* RDF 1.0 generator, original version by garym at teledyn.com */
! 
! if (!isset($feed) || !$feed) {
      $blog = 1; // enter your blog's ID
      $doing_rss = 1;
      require('wp-blog-header.php');
  }
  
  header('Content-type: application/rdf+xml', true);
+ $more = 1;
  
  add_filter('the_content', 'trim');