From 319d0e8bf046735179ebb721bf86f2074df3d3c8 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Tue, 13 Oct 2015 02:12:24 +0000
Subject: [PATCH] Replace `get_bloginfo( 'wpurl' )` with `admin_url()` for
 plugin activation error message.

Use `add_query_arg()` instead of constructing the URL manually.

Props johnbillion.
Fixes #34280.
Built from https://develop.svn.wordpress.org/trunk@35109


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

diff --git a/wp-admin/plugins.php b/wp-admin/plugins.php
index 5c549f80ef..93aec79d78 100644
--- a/wp-admin/plugins.php
+++ b/wp-admin/plugins.php
@@ -462,8 +462,14 @@ if ( ! empty( $invalid ) ) {
 	?>
 	<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) ) { ?>
-	<iframe style="border:0" width="100%" height="70px" src="<?php echo 'plugins.php?action=error_scrape&amp;plugin=' . esc_attr($plugin) . '&amp;_wpnonce=' . esc_attr($_GET['_error_nonce']); ?>"></iframe>
+		if ( ! isset( $_GET['main'] ) && ! isset( $_GET['charsout'] ) && wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $plugin ) ) {
+			$iframe_url = add_query_arg( array(
+				'action'   => 'error_scrape',
+				'plugin'   => urlencode( $plugin ),
+				'_wpnonce' => urlencode( $_GET['_error_nonce'] ),
+			), admin_url( 'plugins.php' ) );
+		?>
+		<iframe style="border:0" width="100%" height="70px" src="<?php echo esc_url( $iframe_url ); ?>"></iframe>
 	<?php
 		}
 	?>
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 830193cca6..074d1f2a34 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.4-alpha-35108';
+$wp_version = '4.4-alpha-35109';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.