Changeset 35107

Timestamp:

10/13/2015 02:04:14 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Replace get_bloginfo( 'wpurl' ) with admin_url() in plugin editor.

Use add_query_arg() instead of constructing the URL manually.

Props johnbillion.
See #34280.

File:

• trunk/src/wp-admin/plugin-editor.php (modified) (1 diff)

trunk/src/wp-admin/plugin-editor.php

@@ -172 +172 @@
  <div id="message" class="updated"><p><?php _e('This plugin has been deactivated because your changes resulted in a <strong>fatal error</strong>.') ?></p>
     <?php
-        if ( wp_verify_nonce($_GET['_error_nonce'], 'plugin-activation-error_' . $file) ) { ?>
-    <iframe style="border:0" width="100%" height="70px" src="<?php bloginfo('wpurl'); ?>/wp-admin/plugins.php?action=error_scrape&amp;plugin=<?php echo esc_attr($file); ?>&amp;_wpnonce=<?php echo esc_attr($_GET['_error_nonce']); ?>"></iframe>
+        if ( wp_verify_nonce( $_GET['_error_nonce'], 'plugin-activation-error_' . $file ) ) {
+            $iframe_url = add_query_arg( array(
+                'action'   => 'error_scrape',
+                'plugin'   => urlencode( $file ),
+                '_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 } ?>
 </div>