Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-11-04 18:01:42 +01:00
Code Issues Projects Releases Wiki Activity

php7.3 compatibility: Fix compact throwing notices for multisite

Browse Source 
In PHP 7.3, the compact() function has been changed to issue an E_NOTICE level error if a passed string refers to an unset variable. In previous versions of PHP, this notice was silently skipped. The full RFC can be viewed here: https://wiki.php.net/rfc/compact

By initializing these variables, they can be compacted.

Previously [43819].
See #44416.
Props desrosj.


Built from https://develop.svn.wordpress.org/branches/5.0@43832


git-svn-id: http://core.svn.wordpress.org/branches/5.0@43661 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Aaron Jorbin 2018-10-26 20:18:38 +00:00
parent 97a88cdf69
commit 8b7967db38
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wp-includes/class-wp-network-query.php
View File

@ -328,6 +328,7 @@ class WP_Network_Query {
$number = absint( $this->query_vars['number'] ); $number = absint( $this->query_vars['number'] );
$offset = absint( $this->query_vars['offset'] ); $offset = absint( $this->query_vars['offset'] );
$limits = '';
if ( ! empty( $number ) ) { if ( ! empty( $number ) ) {
if ( $offset ) { if ( $offset ) {
@ -393,6 +394,8 @@ class WP_Network_Query {
$where = implode( ' AND ', $this->sql_clauses['where'] ); $where = implode( ' AND ', $this->sql_clauses['where'] );
$groupby = '';
$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' ); $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
/** /**

3
wp-includes/class-wp-site-query.php
View File

@ -372,6 +372,7 @@ class WP_Site_Query {
$number = absint( $this->query_vars['number'] ); $number = absint( $this->query_vars['number'] );
$offset = absint( $this->query_vars['offset'] ); $offset = absint( $this->query_vars['offset'] );
$limits = '';
if ( ! empty( $number ) ) { if ( ! empty( $number ) ) {
if ( $offset ) { if ( $offset ) {
@ -525,6 +526,8 @@ class WP_Site_Query {
$where = implode( ' AND ', $this->sql_clauses['where'] ); $where = implode( ' AND ', $this->sql_clauses['where'] );
$groupby = '';
$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' ); $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.0-beta1-43831'; $wp_version = '5.0-beta1-43832';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.