From 27bc2d9db6bca35045c264d588c6df77b99ce6b5 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <afercia@git.wordpress.org>
Date: Wed, 7 Dec 2016 18:47:47 +0000
Subject: [PATCH] Accessibility: Remove inappropriate content from the Plugins
 screen heading.

See #26601.


git-svn-id: https://develop.svn.wordpress.org/trunk@39535 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/js/updates.js |  2 +-
 src/wp-admin/plugins.php   | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/wp-admin/js/updates.js b/src/wp-admin/js/updates.js
index 400842ebd4..91e9d54d02 100644
--- a/src/wp-admin/js/updates.js
+++ b/src/wp-admin/js/updates.js
@@ -2259,7 +2259,7 @@
 				} else if ( $oldSubTitle.length ) {
 					$oldSubTitle.replaceWith( $subTitle );
 				} else {
-					$( '.wrap h1' ).append( $subTitle );
+					$( '.wp-header-end' ).before( $subTitle );
 				}
 
 				$( 'body' ).removeClass( 'loading-content' );
diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index ae5ea58c50..2eeea4eb9f 100644
--- a/src/wp-admin/plugins.php
+++ b/src/wp-admin/plugins.php
@@ -491,9 +491,13 @@ if ( ! empty( $invalid ) ) {
 <?php endif; ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title );
+<h1 class="wp-heading-inline"><?php
+echo esc_html( $title );
+?></h1>
+
+<?php
 if ( ( ! is_multisite() || is_network_admin() ) && current_user_can('install_plugins') ) { ?>
- <a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'plugin'); ?></a>
+	<a href="<?php echo self_admin_url( 'plugin-install.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
 <?php
 }
 
@@ -502,7 +506,8 @@ if ( strlen( $s ) ) {
 	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( urldecode( $s ) ) );
 }
 ?>
-</h1>
+
+<hr class="wp-header-end">
 
 <?php
 /**