Make WordPress Core


Ignore:
Timestamp:
02/02/2008 06:42:09 PM (17 years ago)
Author:
ryan
Message:

Some notice fixes from Nazgul. fixes #3155

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/classes.php

    r6552 r6711  
    186186        } else {
    187187            // We're showing a feed, so WP is indeed the only thing that last changed
    188             if ( $this->query_vars['withcomments']
    189                 || ( !$this->query_vars['withoutcomments']
    190                     && ( $this->query_vars['p']
    191                         || $this->query_vars['name']
    192                         || $this->query_vars['page_id']
    193                         || $this->query_vars['pagename']
    194                         || $this->query_vars['attachment']
    195                         || $this->query_vars['attachment_id']
     188            if ( !empty($this->query_vars['withcomments'])
     189                || ( empty($this->query_vars['withoutcomments'])
     190                    && ( !empty($this->query_vars['p'])
     191                        || !empty($this->query_vars['name'])
     192                        || !empty($this->query_vars['page_id'])
     193                        || !empty($this->query_vars['pagename'])
     194                        || !empty($this->query_vars['attachment'])
     195                        || !empty($this->query_vars['attachment_id'])
    196196                    )
    197197                )
     
    209209            else $client_etag = false;
    210210
    211             $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE']);
     211            $client_last_modified = empty($_SERVER['HTTP_IF_MODIFIED_SINCE']) ? '' : trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
    212212            // If string is empty, return 0. If not, attempt to parse into a timestamp
    213213            $client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
Note: See TracChangeset for help on using the changeset viewer.