From d065fe3cb856da6943f6793e95bb7f2714c976c2 Mon Sep 17 00:00:00 2001
From: Mark Jaquith <markjaquith@git.wordpress.org>
Date: Fri, 7 Sep 2007 02:25:54 +0000
Subject: [PATCH] Try more ways of getting wp-admin URL in wp_die().  props
 Nazgul.  fixes #4006

git-svn-id: https://develop.svn.wordpress.org/trunk@6057 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-includes/functions.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index cd80adeb2c..a3b9066449 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1182,7 +1182,11 @@ function wp_die( $message, $title = '' ) {
 		$message = "<p>$message</p>";
 	}
 
-	if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
+	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) 
+		$admin_dir = WP_SITEURL.'/wp-admin/'; 
+	elseif (function_exists('get_bloginfo') && '' != get_bloginfo('wpurl'))
+		$admin_dir = get_bloginfo('wpurl').'/wp-admin/'; 
+	elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
 		$admin_dir = '';
 	else
 		$admin_dir = 'wp-admin/';