From 5f9cf0141e2e32f47ae7f809b7a6bbc0d4bd4ef2 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 23 Nov 2020 13:36:07 +0000
Subject: [PATCH] Plugins: Check if `_error_nonce` is set before attempting to
 verify it.

This avoids a PHP notice on the Plugins screen when `error` query string is added to the URL.

Props wponlinesupport.
Fixes #43876.
Built from https://develop.svn.wordpress.org/trunk@49683


git-svn-id: http://core.svn.wordpress.org/trunk@49406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/plugins.php    | 4 +++-
 wp-includes/version.php | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index d8f909a7da..70abe322ed 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -641,7 +641,9 @@ if ( isset( $_GET['error'] ) ) :
 	<div id="message" class="error"><p><?php echo $errmsg; ?></p>
 	<?php
 
-	if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
+	if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] )
+		&& isset( $_GET['_error_nonce'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin )
+	) {
 		$iframe_url = add_query_arg(
 			array(
 				'action'   => 'error_scrape',
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 991653df02..b01150bf6f 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.7-alpha-49681';
+$wp_version = '5.7-alpha-49683';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.