Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

General: Backport PHP 7.1 fixes to the 4.5 branch to avoid fatal errors and warnings. 

Props simonvik, ayeshrajans

See #41135

Built from https://develop.svn.wordpress.org/branches/4.5@41128


git-svn-id: http://core.svn.wordpress.org/branches/4.5@40968 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
John Blackbourn 2017-07-24 22:25:32 +00:00
parent 668efc78c0
commit 030d6166f9
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-oembed.php
View File

@ -221,6 +221,7 @@ class WP_oEmbed {
* @return false|string False on failure, otherwise the oEmbed provider URL.
*/
public function get_provider( $url, $args = '' ) {
$args = wp_parse_args( $args );
$provider = false;
@ -315,6 +316,8 @@ class WP_oEmbed {
* @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
*/
public function get_html( $url, $args = '' ) {
$args = wp_parse_args( $args );
/**
* Filters the oEmbed result before any HTTP requests are made.
*

2
wp-includes/user.php
View File

@ -27,6 +27,8 @@
*/
function wp_signon( $credentials = array(), $secure_cookie = '' ) {
if ( empty($credentials) ) {
$credentials = array(); // Back-compat for plugins passing an empty string.
if ( ! empty($_POST['log']) )
$credentials['user_login'] = $_POST['log'];
if ( ! empty($_POST['pwd']) )

2
wp-login.php
View File

@ -781,7 +781,7 @@ default:
$reauth = empty($_REQUEST['reauth']) ? false : true;
$user = wp_signon( '', $secure_cookie );
$user = wp_signon( array(), $secure_cookie );
if ( empty( $_COOKIE[ LOGGED_IN_COOKIE ] ) ) {
if ( headers_sent() ) {