From b79e2df684ea33d681274397aceffb5eed48c58d Mon Sep 17 00:00:00 2001
From: audrasjb <audrasjb@git.wordpress.org>
Date: Fri, 5 Aug 2022 06:00:09 +0000
Subject: [PATCH] Coding standards: Properly escape URLs returned by
 `self_admin_url()` calls.

Props krishaweb, audrasjb, SergeyBiryukov.
Fixes #56329.

Built from https://develop.svn.wordpress.org/trunk@53839


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

diff --git a/wp-admin/includes/plugin-install.php b/wp-admin/includes/plugin-install.php
index de21b7e96d..cc2294ee5a 100644
--- a/wp-admin/includes/plugin-install.php
+++ b/wp-admin/includes/plugin-install.php
@@ -342,7 +342,7 @@ function install_plugins_upload() {
 	?>
 <div class="upload-plugin">
 	<p class="install-help"><?php _e( 'If you have a plugin in a .zip format, you may install or update it by uploading it here.' ); ?></p>
-	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-plugin' ); ?>">
+	<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url( self_admin_url( 'update.php?action=upload-plugin' ) ); ?>">
 		<?php wp_nonce_field( 'plugin-upload' ); ?>
 		<label class="screen-reader-text" for="pluginzip"><?php _e( 'Plugin zip file' ); ?></label>
 		<input type="file" id="pluginzip" name="pluginzip" accept=".zip" />
diff --git a/wp-admin/includes/theme-install.php b/wp-admin/includes/theme-install.php
index 93c2895dca..2cfb9dbb02 100644
--- a/wp-admin/includes/theme-install.php
+++ b/wp-admin/includes/theme-install.php
@@ -182,7 +182,7 @@ function install_themes_dashboard() {
 function install_themes_upload() {
 	?>
 <p class="install-help"><?php _e( 'If you have a theme in a .zip format, you may install or update it by uploading it here.' ); ?></p>
-<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url( 'update.php?action=upload-theme' ); ?>">
+<form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo esc_url( self_admin_url( 'update.php?action=upload-theme' ) ); ?>">
 	<?php wp_nonce_field( 'theme-upload' ); ?>
 	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
 	<input type="file" id="themezip" name="themezip" accept=".zip" />
diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index cbd401c8a7..9a1945f6be 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -726,7 +726,7 @@ echo esc_html( $title );
 <?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 esc_url( self_admin_url( 'plugin-install.php' ) ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'plugin' ); ?></a>
 	<?php
 }
 
diff --git a/wp-admin/update-core.php b/wp-admin/update-core.php
index 049facecef..d4509763b3 100644
--- a/wp-admin/update-core.php
+++ b/wp-admin/update-core.php
@@ -917,7 +917,7 @@ function do_core_upgrade( $reinstall = false ) {
 	?>
 	</div>
 	<script type="text/javascript">
-	window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>';
+	window.location = '<?php echo esc_url( self_admin_url( 'about.php?updated' ) ); ?>';
 	</script>
 	<?php
 }
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 20edb79d9b..022e2fc348 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.1-alpha-53838';
+$wp_version = '6.1-alpha-53839';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.