From 5776762bbd3841c2e90782cdaea848f032929009 Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 22 May 2007 13:18:32 +0000
Subject: WP Merge 5509

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@976 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-includes/functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wp-includes/functions.php')

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 97b9915..1d2edc1 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1348,7 +1348,7 @@ function wp_nonce_ays($action) {
 function wp_die( $message, $title = '' ) {
 	global $wp_locale;
 
-	if ( is_wp_error( $message ) ) {
+	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty($title) ) {
 			$error_data = $message->get_error_data();
 			if ( is_array($error_data) && isset($error_data['title']) )
-- 
cgit