Ticket #34294: 34294.3.patch

src/wp-admin/js/common.js

@@ -369 +369 @@
                 });
         }
 
-        // Move .notice, .updated and .error alert boxes. Don't move boxes designed to be inline.
-        $firstHeading = $( '.wrap > h1:first' );
-
-        // Back compatibility: if there is no H1, apply to first H2.
-        if ( ! $firstHeading.length ) {
-                $firstHeading = $( '.wrap h2:first' );
-        }
-
-        $firstHeading.nextAll( 'div.updated, div.error, div.notice' ).addClass( 'below-h2' );
-        $( 'div.updated, div.error, div.notice' ).not( '.below-h2, .inline' ).insertAfter( $firstHeading );
+        $( 'div.updated, div.error, div.notice' ).not( '.inline' ).insertBefore( $( '.wrap' ).find( 'form' ).first() );
 
         // Make notices dismissible
         $( '.notice.is-dismissible' ).each( function() {

src/wp-includes/js/autosave.js

@@ -346 +346 @@
                                 };
 
                                 $notice = $( '#local-storage-notice' );
-                                $('.wrap h2').first().after( $notice.addClass( 'notice-warning' ).show() );
+                                $( '.wrap' ).find( 'form' ).first().before( $notice.addClass( 'notice-warning' ).show() );
 
                                 $notice.on( 'click.autosave-local', function( event ) {
                                         var $target = $( event.target );