Changeset 6110 for trunk/wp-includes/functions.php

Timestamp:

09/13/2007 06:23:23 AM (18 years ago)

Author:

markjaquith

Message:

Use wp_die() for WPDB bails. Send 500 response and no-cache headers so wp_die()s are not cached. props DD32. fixes #3471

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1241 +1241 @@
         $admin_dir = 'wp-admin/';
 
-    if ( !did_action('admin_head') ) :
+    if ( !function_exists('did_action') || !did_action('admin_head') ) :
+    status_header(500);
+    nocache_headers();
     header('Content-Type: text/html; charset=utf-8');
 
-    if ( empty($title) )
-        $title = __('WordPress › Error');
-
-
+    if ( empty($title) ){
+        if( function_exists('__') )
+            $title = __('WordPress › Error');
+        else
+            $title = 'WordPress › Error';
+    }
 
 ?>