From ead6bfebf7206c441520e78170d53ffce64d1fca Mon Sep 17 00:00:00 2001 From: markjaquith 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: http://svn.automattic.com/wordpress/trunk@6057 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- 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 = "

$message

"; } - 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/';