Changeset 31363

Timestamp:

02/07/2015 06:20:42 AM (10 years ago)

Author:

SergeyBiryukov

Message:

Avoid inadvertent stomping of the original $args parameter passed to plugins_api_result and themes_api_result filters in plugins_api() and themes_api(), respectively.

Fixes a regression introduced in [25956].

props Corphi, obenland.
fixes #29079.

Location:

trunk/src/wp-admin/includes

Files:

• plugin-install.php (modified) (2 diffs)
• theme.php (modified) (3 diffs)

trunk/src/wp-admin/includes/plugin-install.php

@@ -71 +71 @@
             $url = set_url_scheme( $url, 'https' );
 
-        $args = array(
+        $http_args = array(
             'timeout' => 15,
             'body' => array(
@@ -78 +78 @@
             )
         );
-        $request = wp_remote_post( $url, $args );
+        $request = wp_remote_post( $url, $http_args );
 
         if ( $ssl && is_wp_error( $request ) ) {
             trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-            $request = wp_remote_post( $http_url, $args );
+            $request = wp_remote_post( $http_url, $http_args );
         }
 

trunk/src/wp-admin/includes/theme.php

@@ -360 +360 @@
             $url = set_url_scheme( $url, 'https' );
 
-        $args = array(
+        $http_args = array(
             'body' => array(
                 'action' => $action,
@@ -366 +366 @@
             )
         );
-        $request = wp_remote_post( $url, $args );
+        $request = wp_remote_post( $url, $http_args );
 
         if ( $ssl && is_wp_error( $request ) ) {
@@ -372 +372 @@
                 trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
             }
-            $request = wp_remote_post( $http_url, $args );
+            $request = wp_remote_post( $http_url, $http_args );
         }