Changeset 6057 for trunk/wp-includes/functions.php

Timestamp:

09/07/2007 02:25:54 AM (17 years ago)

Author:

markjaquith

Message:

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

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -1183 +1183 @@
     }
 
-    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