Changeset 6711 for trunk/wp-includes/classes.php

Timestamp:

02/02/2008 06:42:09 PM (19 years ago)

Author:

ryan

Message:

Some notice fixes from Nazgul. fixes #3155

File:

• trunk/wp-includes/classes.php (modified) (2 diffs)

trunk/wp-includes/classes.php

@@ -186 +186 @@
                 } else {
                         // We're showing a feed, so WP is indeed the only thing that last changed
-                        if ( $this->query_vars['withcomments']
-                                || ( !$this->query_vars['withoutcomments']
-                                        && ( $this->query_vars['p']
-                                                || $this->query_vars['name']
-                                                || $this->query_vars['page_id']
-                                                || $this->query_vars['pagename']
-                                                || $this->query_vars['attachment']
-                                                || $this->query_vars['attachment_id']
+                        if ( !empty($this->query_vars['withcomments'])
+                                || ( empty($this->query_vars['withoutcomments'])
+                                        && ( !empty($this->query_vars['p'])
+                                                || !empty($this->query_vars['name'])
+                                                || !empty($this->query_vars['page_id'])
+                                                || !empty($this->query_vars['pagename'])
+                                                || !empty($this->query_vars['attachment'])
+                                                || !empty($this->query_vars['attachment_id'])
                                         )
                                 )
@@ -209 +209 @@
                         else $client_etag = false;
 
-                        $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']);
+                        $client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
                         // If string is empty, return 0. If not, attempt to parse into a timestamp
                         $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;