WordPress.org

Make WordPress Core

Changeset 31363


Ignore:
Timestamp:
02/07/2015 06:20:42 AM (6 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:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/plugin-install.php

    r31333 r31363  
    7171            $url = set_url_scheme( $url, 'https' );
    7272
    73         $args = array(
     73        $http_args = array(
    7474            'timeout' => 15,
    7575            'body' => array(
     
    7878            )
    7979        );
    80         $request = wp_remote_post( $url, $args );
     80        $request = wp_remote_post( $url, $http_args );
    8181
    8282        if ( $ssl && is_wp_error( $request ) ) {
    8383            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 );
    84             $request = wp_remote_post( $http_url, $args );
     84            $request = wp_remote_post( $http_url, $http_args );
    8585        }
    8686
  • trunk/src/wp-admin/includes/theme.php

    r31217 r31363  
    360360            $url = set_url_scheme( $url, 'https' );
    361361
    362         $args = array(
     362        $http_args = array(
    363363            'body' => array(
    364364                'action' => $action,
     
    366366            )
    367367        );
    368         $request = wp_remote_post( $url, $args );
     368        $request = wp_remote_post( $url, $http_args );
    369369
    370370        if ( $ssl && is_wp_error( $request ) ) {
     
    372372                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 );
    373373            }
    374             $request = wp_remote_post( $http_url, $args );
     374            $request = wp_remote_post( $http_url, $http_args );
    375375        }
    376376
Note: See TracChangeset for help on using the changeset viewer.