Ticket #39516: 39516.4.diff

src/wp-includes/js/media-views.js

@@ -3772 +3772 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
+                // In the Media Library, the sidebar is used to display errors before the attachments grid.
+                if ( this.options.sidebar && 'errors' === this.options.sidebar ) {
+                        this.createSidebar();
+                }
                 this.createUploader();
                 this.createAttachments();
-                if ( this.options.sidebar ) {
+                // For accessibility reasons, place the normal sidebar after the attachments, see ticket #36909.
+                if ( this.options.sidebar && 'errors' !== this.options.sidebar ) {
                         this.createSidebar();
                 }
                 this.updateContent();

src/wp-includes/js/media/views/attachments/browser.js

@@ -41 +41 @@
                 this.controller.on( 'toggle:upload:attachment', this.toggleUploader, this );
                 this.controller.on( 'edit:selection', this.editSelection );
                 this.createToolbar();
+                // In the Media Library, the sidebar is used to display errors before the attachments grid.
+                if ( 'library' === this.options.state ) {
+                        this.createSidebar();
+                }
                 this.createUploader();
                 this.createAttachments();
-                if ( this.options.sidebar ) {
+                // For accessibility reasons, place the normal sidebar after the attachments, see ticket #36909.
+                if ( 'library' !== this.options.state ) {
                         this.createSidebar();
                 }
                 this.updateContent();