Changeset 559 for trunk/wp-rss.php

Timestamp:

11/30/2003 12:55:19 AM (22 years ago)

Author:

mikelittle

Message:

Fixed several instances in WordPress where PHP Notices are not being handled correctly.
Fixes supplied by Aaron Jensen (aaron@…).

File:

• trunk/wp-rss.php (modified) (3 diffs)

trunk/wp-rss.php

@@ -2 +2 @@
          In every template you do, you got to copy them before the CafeLog 'loop' */
 $blog = 1; // enter your blog's ID
-$doing_rss=1;
+$doing_rss = 1;
 header('Content-type: text/xml',true);
 include('blog.header.php');
@@ -9 +9 @@
 
 // Get the time of the most recent article
-$sql = "SELECT max(post_date) FROM $tableposts";
-
-$maxdate = $wpdb->get_var($sql);
+$maxdate = $wpdb->get_var("SELECT max(post_date) FROM $tableposts");
 ++$querycount;
 $unixtime = strtotime($maxdate);
 
 // format timestamp for Last-Modified header
-$clast = gmdate("D, d M Y H:i:s \G\M\T",$unixtime);
-$cetag = md5($last);
+$clast = gmdate("D, d M Y H:i:s \G\M\T", $unixtime);
+$cetag = (isset($last)) ? md5($last) : '';
 
-$slast = $_SERVER['HTTP_IF_MODIFIED_SINCE'];
-$setag = $_SERVER['HTTP_IF_NONE_MATCH'];
+$slast = (isset($_SERVER['HTTP_IF_MODIFIED_SINCE'])) ? $_SERVER['HTTP_IF_MODIFIED_SINCE'] : '' ;
+$setag = (isset($_SERVER['HTTP_IF_NONE_MATCH'])) ? $_SERVER['HTTP_IF_NONE_MATCH'] : '';
 
 // send it in a Last-Modified header
@@ -33 +31 @@
 // generated values.
 //if (($slast?($slast == $clast):true) && ($setag?($setag == $cetag):true)){
-if (($slast && $setag)?(($slast == $clast) && ($setag == $cetag)):(($slast == $clast) || ($setag == $cetag))) { 
-    header("HTTP/1.1 304 Not Modified");
-    echo "\r\n\r\n";
-    exit;
+if (($slast != '') && ($setag != '')) {
+    if (($slast == $clast) && ($setag == $cetag)) {
+        header("HTTP/1.1 304 Not Modified");
+        echo "\r\n\r\n";
+        exit;
+    } else if (($slast == $clast)
+               || ($setag == $cetag)) {
+        header("HTTP/1.1 304 Not Modified");
+        echo "\r\n\r\n";
+        exit;
+    }
 }