Show
Ignore:
Timestamp:
10/12/07 16:21:15 (1 year ago)
Author:
donncha
Message:

Merge with WP 2.3 - testing use only!
Move pluggable functions out of wpmu-functions and into pluggable.php, fixes #439

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/wp-admin/admin-header.php

    r972 r1069  
    11<?php 
    2 @header('Content-type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); 
     2@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset')); 
    33if (!isset($_GET["page"])) require_once('admin.php'); 
    44if ( $editing ) { 
    …… 
    1818<meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" /> 
    1919<title><?php bloginfo('name') ?> &rsaquo; <?php echo wp_specialchars( strip_tags( $title ) ); ?> &#8212; WordPress</title> 
    20 <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/wp-admin.css?version=<?php bloginfo('version'); ?>" type="text/css" /> 
    21 <?php if ( ('rtl' == $wp_locale->text_direction) ) : ?> 
    22 <link rel="stylesheet" href="<?php echo get_option('siteurl') ?>/wp-admin/rtl.css?version=<?php bloginfo('version'); ?>" type="text/css" /> 
    23 <?php endif; ?>  
     20<?php wp_admin_css(); ?> 
    2421<script type="text/javascript"> 
    2522//<![CDATA[ 
    …… 
    4340?> 
    4441</head> 
    45 <body> 
     42<body class="wp-admin <?php echo apply_filters( 'admin_body_class', '' ); ?>"> 
    4643<div id="wphead"> 
    47 <h1><?php bloginfo('name'); ?> <span>(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1> 
     44<h1><?php bloginfo('name'); ?> <span id="viewsite">(<a href="<?php echo get_option('home') . '/'; ?>"><?php _e('View site &raquo;') ?></a>)</span></h1> 
    4845</div> 
    4946<div id="user_info"><p><?php printf(__('Howdy, <strong>%s</strong>.'), $user_identity) ?> [<a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>"><?php _e('Sign Out'); ?></a>, <a href="profile.php"><?php _e('My Profile'); ?></a>] </p></div> 
    5047 
    5148<?php 
    52 require(ABSPATH . '/wp-admin/menu-header.php'); 
     49require(ABSPATH . 'wp-admin/menu-header.php'); 
    5350 
    5451if ( $parent_file == 'options-general.php' ) { 
    55         require(ABSPATH . '/wp-admin/options-head.php'); 
     52        require(ABSPATH . 'wp-admin/options-head.php'); 
    5653} 
    5754?>