Merge pull request #3168 from ravinderk/issues/3155

fix(admin-plugins): update notice shouldn't display when actively updating add-ons #3155
impress-org · May 3, 2018 · 700b3be · 700b3be
2 parents dfde239 + bc5f40c
commit 700b3be
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/includes/admin/upgrades/class-give-updates.php b/includes/admin/upgrades/class-give-updates.php
@@ -584,6 +584,8 @@ public function __health_background_update( $give_updates ) {
 	 * @access public
 	 */
 	public function __show_notice() {
+		$current_screen = get_current_screen();
+
 		// Bailout.
 		if ( ! current_user_can( 'manage_give_settings' ) ) {
 			return;
@@ -596,7 +598,7 @@ public function __show_notice() {
 
 
 		// Bailout.
-		if ( isset( $_GET['page'] ) && 'give-updates' === $_GET['page'] ) {
+		if ( in_array( $current_screen->base, array( 'give_forms_page_give-updates', 'update-core' ) ) ) {
 			return;
 		}