WordPress.org

Make WordPress Core

Changeset 5411


Ignore:
Timestamp:
05/07/07 23:24:44 (7 years ago)
Author:
ryan
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/functions.php

    r5401 r5411  
    13491349    } 
    13501350 
    1351     header('Content-Type: text/html; charset=utf-8'); 
    1352  
    1353     if ( empty($title) ) 
    1354         $title = __('WordPress › Error'); 
    1355  
    13561351    if (strpos($_SERVER['PHP_SELF'], 'wp-admin') !== false) 
    13571352        $admin_dir = ''; 
    13581353    else 
    13591354        $admin_dir = 'wp-admin/'; 
     1355 
     1356    if ( !did_action('admin_head') ) : 
     1357    header('Content-Type: text/html; charset=utf-8'); 
     1358 
     1359    if ( empty($title) ) 
     1360        $title = __('WordPress › Error'); 
     1361 
     1362 
    13601363 
    13611364?> 
     
    13721375</head> 
    13731376<body> 
     1377<?php endif; ?> 
    13741378    <h1 id="logo"><img alt="WordPress" src="<?php echo $admin_dir; ?>images/wordpress-logo.png" /></h1> 
    13751379    <?php echo $message; ?> 
Note: See TracChangeset for help on using the changeset viewer.