Changeset 1358

Timestamp:

05/24/2004 06:24:12 PM (22 years ago)

Author:

michelvaldrighi

Message:

some cleanups, and a quick undefined variable fix

Location:

trunk

Files:

• wp-atom.php (modified) (1 diff)
• wp-rdf.php (modified) (1 diff)
• wp-rss.php (modified) (3 diffs)
• wp-rss2.php (modified) (1 diff)

trunk/wp-atom.php

@@ -1 @@
-<?php 
-if (! $feed) {
+<?php
+
+if (!isset($feed) || !$feed) {
     $blog = 1;
     $doing_rss = 1;

trunk/wp-rdf.php

@@ -1 +1 @@
 <?php /* RDF 1.0 generator, original version by garym@teledyn.com */
-if (! $feed) {
+
+if (!isset($feed) || !$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);
+$more = 1;
 
 add_filter('the_content', 'trim');

trunk/wp-rss.php

@@ -1 @@
-<?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
+<?php
+
+if (!isset($feed) || !$feed) {
+    $blog = 1;
     $doing_rss = 1;
     require('wp-blog-header.php');
@@ -8 +8 @@
 
 header('Content-type: text/xml', true);
+$more = 1;
 
 ?>
@@ -24 +25 @@
             <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')) {
 ?>

trunk/wp-rss2.php

@@ -1 @@
-<?php 
-if (!isset($feed)) {
+<?php
+
+if (!isset($feed) || !$feed) {
     $blog = 1;
     $doing_rss = 1;
     require('wp-blog-header.php');
 }
+
+header('Content-type: text/xml', true);
 $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 . '"?'.'>'; ?>
+<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
 
 <!-- generator="wordpress/<?php echo $wp_version ?>" -->