From f5f5709cba60c5710296115efb1dad4bf1f51406 Mon Sep 17 00:00:00 2001
From: ryan <ryan@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 16 Jul 2006 15:41:36 +0000
Subject: [PATCH] bail() cannot use wp_die(). wp_die() isn't loaded when bail()
 runs. fixes #2941

git-svn-id: http://svn.automattic.com/wordpress/trunk@4018 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/wp-db.php | 53 ++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 52 insertions(+), 1 deletion(-)
diff --git a/wp-includes/wp-db.php b/wp-includes/wp-db.php
index d3db929ad1..5641c0638c 100644
--- a/wp-includes/wp-db.php
+++ b/wp-includes/wp-db.php
@@ -306,7 +306,58 @@ class wpdb {
 		if ( !$this->show_errors )
 			return false;
 
-		wp_die($message);
+		header( 'Content-Type: text/html; charset=utf-8');
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title><?php WordPress &rsaquo; Error ?></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style media="screen" type="text/css">
+	<!--
+	html {
+		background: #eee;
+	}
+	body {
+		background: #fff;
+		color: #000;
+		font-family: Georgia, "Times New Roman", Times, serif;
+		margin-left: 25%;
+		margin-right: 25%;
+		padding: .2em 2em;
+	}
+
+	h1 {
+		color: #006;
+		font-size: 18px;
+		font-weight: lighter;
+	}
+
+	h2 {
+		font-size: 16px;
+	}
+
+	p, li, dt {
+		line-height: 140%;
+		padding-bottom: 2px;
+	}
+
+	ul, ol {
+		padding: 5px 5px 5px 20px;
+	}
+	#logo {
+		margin-bottom: 2em;
+	}
+	-->
+	</style>
+</head>
+<body>
+	<h1 id="logo"><img alt="WordPress" src="<?php echo "wp-admin/images/wordpress-logo.png" ?>/></h1>
+	<p><?php echo $message; ?></p>
+</body>
+</html>
+<?php
+		die();
 	}
 }
 
