Changeset 5410

Show
Ignore:
Timestamp:
05/07/07 23:24:09 (2 years ago)
Author:
ryan
Message:

Don't send header from wp_die() if admin header already sent. fixes #4234 for 2.2.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/2.2/wp-includes/functions.php

    r5400 r5410  
    13331333    } 
    13341334 
    1335     header('Content-Type: text/html; charset=utf-8'); 
    1336  
    1337     if ( empty($title) ) 
    1338         $title = __('WordPress › Error'); 
    1339  
    13401335    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
    13411336        $admin_dir = ''; 
    13421337    else 
    13431338        $admin_dir = 'wp-admin/'; 
     1339 
     1340    if ( !did_action('admin_head') ) : 
     1341    header('Content-Type: text/html; charset=utf-8'); 
     1342 
     1343    if ( empty($title) ) 
     1344        $title = __('WordPress › Error'); 
     1345 
     1346 
    13441347 
    13451348?> 
    …… 
    13561359</head> 
    13571360<body> 
     1361<?php endif; ?> 
    13581362    <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1> 
    13591363    <?php echo $message; ?>