mirror of
https://github.com/gosticks/wordpress-develop.git
synced 2026-03-23 06:44:31 +00:00
Collapse crazyhorse to trunk. Incoming! see #7552
git-svn-id: https://develop.svn.wordpress.org/trunk@8691 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
@@ -8,10 +8,6 @@
|
||||
|
||||
@header('Content-Type: ' . get_option('html_type') . '; charset=' . get_option('blog_charset'));
|
||||
if (!isset($_GET["page"])) require_once('admin.php');
|
||||
if ( $editing ) {
|
||||
if ( user_can_richedit() )
|
||||
wp_enqueue_script( 'wp_tiny_mce' );
|
||||
}
|
||||
wp_enqueue_script( 'wp-gears' );
|
||||
|
||||
$min_width_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php', 'widgets.php', 'comment.php', 'link.php' );
|
||||
@@ -33,6 +29,9 @@ if ( in_array( $the_current_page, $min_width_pages ) ) {
|
||||
add_filter( 'admin_body_class', 'add_minwidth' );
|
||||
}
|
||||
|
||||
$fixed_bar_pages = array( 'post.php', 'post-new.php', 'page.php', 'page-new.php' );
|
||||
if ( ! isset($fixed_bar) ) $fixed_bar = in_array( $the_current_page, $fixed_bar_pages ) ? true : false;
|
||||
|
||||
get_admin_page_title();
|
||||
|
||||
?>
|
||||
@@ -143,3 +142,7 @@ if ( $parent_file == 'options-general.php' ) {
|
||||
}
|
||||
?>
|
||||
<div id="wpbody">
|
||||
|
||||
<?php if ( ! $fixed_bar ) { ?>
|
||||
<div id="wpbody-content">
|
||||
<?php } ?>
|
||||
|
||||
Reference in New Issue
Block a user