Ticket #23021: 23021.diff

wp-includes/functions.php

@@ -924 +924 @@
  */
 function nocache_headers() {
         $headers = wp_get_nocache_headers();
+        if ( isset( $headers['Last-Modified'] ) && empty( $headers['Last-Modified'] ) )
+                unset( $headers['Last-Modified'] );
         foreach( $headers as $name => $field_value )
                 @header("{$name}: {$field_value}");
-        if ( empty( $headers['Last-Modified'] ) && function_exists( 'header_remove' ) )
-                @header_remove( 'Last-Modified' );
 }
 
 /**

wp-includes/class-wp.php

@@ -376 +376 @@
 
                 $headers = apply_filters('wp_headers', $headers, $this);
 
+                if ( isset( $headers['Last-Modified'] ) && empty( $headers['Last-Modified'] ) )
+                        unset( $headers['Last-Modified'] );
+
                 if ( ! empty( $status ) )
                         status_header( $status );
                 foreach( (array) $headers as $name => $field_value )
                         @header("{$name}: {$field_value}");
 
-                if ( isset( $headers['Last-Modified'] ) && empty( $headers['Last-Modified'] ) && function_exists( 'header_remove' ) )
-                        @header_remove( 'Last-Modified' );
-
                 if ( $exit_required )
                         exit();