Changeset 10672

Timestamp:

02/28/2009 09:30:46 AM (12 years ago)

Author:

westi

Message:

Make the exit call explicit so that it works. Fixes #9248.

File:

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

trunk/wp-includes/classes.php

@@ -305 +305 @@
         $headers = array('X-Pingback' => get_bloginfo('pingback_url'));
         $status = null;
+        $exit_required = false;
+
         if ( is_user_logged_in() )
             $headers = array_merge($headers, wp_get_nocache_headers());
@@ -350 +352 @@
                      (($client_modified_timestamp >= $wp_modified_timestamp) || ($client_etag == $wp_etag)) ) {
                 $status = 304;
-                add_action('send_headers', 'exit', 1);
+                $exit_required = true;
             }
         }
@@ -360 +362 @@
         foreach( (array) $headers as $name => $field_value )
             @header("{$name}: {$field_value}");
+
+        if ($exit_required)
+            exit();
 
         do_action_ref_array('send_headers', array(&$this));