Ticket #14772: 14772.wp_admin_body_style.patch

wp-includes/admin-bar.php

@@ -293 +293 @@
         <?php
 }
 
-// @TODO do we still need this in core?
-function wp_admin_body_style() {
-        ?>
-        <style type="text/css">
-                <?php
-
-                if (
-                        ( empty( $_GET['nobump'] ) || is_admin() ) &&
-                        ! strpos( $_SERVER['REQUEST_URI'], 'media-upload.php' )
-                ) :
-                        ?>
-                        body { padding-top: 28px !important; }
-                        <?php
-                endif;
-
-                if ( in_array( get_current_theme(), array('H3', 'H4', 'The Journalist v1.9') ) ) :
-                        ?>
-                        body { padding-top: 28px; background-position: 0px 28px; }
-                        <?php
-                endif;
-
-                ?>
-        </style>
-        <?php
-}
-
 /**
  * Determine whether the admin bar should be showing.
  *

wp-includes/class-wp-admin-bar.php

@@ -33 +33 @@
                 $this->user->locale = get_locale();
 
                 add_action( 'wp_head', 'wp_admin_bar_header' );
-                add_action( 'wp_head', 'wp_admin_body_style');
 
                 add_action( 'admin_head', 'wp_admin_bar_header' );
-                add_action( 'admin_head', 'wp_admin_body_style');
 
                 wp_enqueue_script( 'admin-bar' );
                 wp_enqueue_style( 'admin-bar' );

wp-admin/admin-header.php

@@ -79 +79 @@
 
 if ( get_user_setting('mfold') == 'f' )
         $admin_body_class .= ' folded';
+        
+if ( is_admin_bar_showing() )
+        $admin_body_class .= ' admin-bar'; 
 
 if ( $is_iphone ) { ?>
 <style type="text/css">.row-actions{visibility:visible;}</style>

wp-admin/css/wp-admin.dev.css

@@ -1140 +1140 @@
         min-width: 785px;
 }
 
+body.admin-bar {
+        padding-top: 28px;
+}
+
 .narrow {
         width: 70%;
         margin-bottom: 40px;