Changeset 2584

Timestamp:

05/05/2005 11:05:51 PM (21 years ago)

Author:

matt

Message:

He ain't ugly, he's my brother.

File:

• trunk/wp-blog-header.php (modified) (1 diff)

trunk/wp-blog-header.php

@@ -134 +134 @@
         else $client_etag = false;
 
-        if ( $client_last_modified && $client_etag ) {
-                if ( (strtotime($client_last_modified) >= strtotime($wp_last_modified)) || ($client_etag == $wp_etag) ) {
-                        if ( preg_match('/cgi/',php_sapi_name()) ) {
-                                 header('Status: 304 Not Modified');
-                                 echo "\r\n\r\n";
-                                 exit;
-                        } else {
-                                 if ( version_compare(phpversion(), '4.3.0', '>=') ) {
-                                          header('Not Modified', TRUE, 304);
-                                 } else {
-                                          header('HTTP/1.x 304 Not Modified');
-                                 }
-                                exit;
-                        }
+        if ( ($client_last_modified && $client_etag) ?
+                ((strtotime($client_last_modified) >= strtotime($wp_last_modified)) && ($client_etag == $wp_etag)) :
+                ((strtotime($client_last_modified) >= strtotime($wp_last_modified)) || ($client_etag == $wp_etag)) ) {
+                if ( preg_match('/cgi/',php_sapi_name()) ) {
+                        header('Status: 304 Not Modified');
+                        echo "\r\n\r\n";
+                        exit;
+                } else {
+                        if ( version_compare(phpversion(), '4.3.0', '>=') )
+                                header('Not Modified', TRUE, 304);
+                        else
+                                header('HTTP/1.x 304 Not Modified');
+                        exit;
                 }
         }