WordPress.org
Get WordPress

Make WordPress Core

Ticket #4006: trunk.2.diff

File trunk.2.diff, 1018 bytes (added by filosofo, 18 years ago)

  • wp-includes/functions.php

     
    12981298function wp_die( $message, $title = '' ) {
    12991299        global $wp_locale;
    13001300
    1301         if ( is_wp_error( $message ) ) {
     1301        if ( function_exists('is_wp_error') && is_wp_error( $message ) ) {
    13021302                if ( empty($title) ) {
    13031303                        $error_data = $message->get_error_data();
    13041304                        if ( is_array($error_data) && isset($error_data['title']) )
    … …  
    13251325        if ( empty($title) )
    13261326                $title = __('WordPress › Error');
    13271327
    1328         if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false)
    1329                 $admin_dir = '';
    1330         else
    1331                 $admin_dir = 'wp-admin/';
     1328        $admin_dir = ( function_exists('apply_filters') ) ? get_option('siteurl') . '/wp-admin/' :
     1329                ((strpos($_SERVER['PHP_SELF'], 'wp-admin')) ? '' : 'wp-admin/');
    13321330
    13331331?>
    13341332<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">