Changeset 6057

Show
Ignore:
Timestamp:
09/07/07 02:25:54 (1 year ago)
Author:
markjaquith
Message:

Try more ways of getting wp-admin URL in wp_die(). props Nazgul. fixes #4006

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-includes/functions.php

    r6039 r6057  
    11831183    } 
    11841184 
    1185     if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
     1185    if ( defined('WP_SITEURL') && '' != WP_SITEURL )  
     1186        $admin_dir = WP_SITEURL.'/wp-admin/';  
     1187    elseif (function_exists('get_bloginfo') && '' != get_bloginfo('wpurl')) 
     1188        $admin_dir = get_bloginfo('wpurl').'/wp-admin/';  
     1189    elseif (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
    11861190        $admin_dir = ''; 
    11871191    else