WordPress.org

Make WordPress Core

Ticket #41135: 41135-backport-combined-wp4-5.patch

File 41135-backport-combined-wp4-5.patch, 1.6 KB (added by ayeshrajans, 2 years ago)

Changesets 37720 and 37697 backport for 4.5 branch, combined patch

  • wp-includes/class-oembed.php

    diff --git wp-includes/class-oembed.php wp-includes/class-oembed.php
    index 3e19f3ba5..2058ff4be 100644
    public function __call( $name, $arguments ) { 
    221221         * @return false|string False on failure, otherwise the oEmbed provider URL.
    222222         */
    223223        public function get_provider( $url, $args = '' ) {
    224 
     224                $args = wp_parse_args( $args );
    225225                $provider = false;
    226226
    227227                if ( !isset($args['discover']) )
    public static function _remove_provider_early( $format ) { 
    315315         * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
    316316         */
    317317        public function get_html( $url, $args = '' ) {
     318                $args = wp_parse_args( $args );
    318319                /**
    319320                 * Filters the oEmbed result before any HTTP requests are made.
    320321                 *
  • wp-includes/user.php

    diff --git wp-includes/user.php wp-includes/user.php
    index 69cc86c0d..b2828d844 100644
     
    2727 */
    2828function wp_signon( $credentials = array(), $secure_cookie = '' ) {
    2929        if ( empty($credentials) ) {
     30                $credentials = array(); // Back-compat for plugins passing an empty string.
     31
    3032                if ( ! empty($_POST['log']) )
    3133                        $credentials['user_login'] = $_POST['log'];
    3234                if ( ! empty($_POST['pwd']) )
  • wp-login.php

    diff --git wp-login.php wp-login.php
    index ed3878c29..b407ce415 100644
    function retrieve_password() { 
    781781
    782782        $reauth = empty($_REQUEST['reauth']) ? false : true;
    783783
    784         $user = wp_signon( '', $secure_cookie );
     784        $user = wp_signon( array(), $secure_cookie );
    785785
    786786        if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
    787787                if ( headers_sent() ) {