Changeset 43832

Timestamp:

10/26/2018 08:16:22 PM (6 years ago)

Author:

jorbin

Message:

php7.3 compatibility: Fix compact throwing notices for multisite

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.

Location:

branches/5.0/src/wp-includes

Files:

• class-wp-network-query.php (modified) (2 diffs)
• class-wp-site-query.php (modified) (2 diffs)

branches/5.0/src/wp-includes/class-wp-network-query.php

@@ -329 +329 @@
         $number = absint( $this->query_vars['number'] );
         $offset = absint( $this->query_vars['offset'] );
+        $limits = '';
 
         if ( ! empty( $number ) ) {
@@ -393 +394 @@
 
         $where = implode( ' AND ', $this->sql_clauses['where'] );
+
+        $groupby = '';
 
         $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );

branches/5.0/src/wp-includes/class-wp-site-query.php

@@ -373 +373 @@
         $number = absint( $this->query_vars['number'] );
         $offset = absint( $this->query_vars['offset'] );
+        $limits = '';
 
         if ( ! empty( $number ) ) {
@@ -525 +526 @@
 
         $where = implode( ' AND ', $this->sql_clauses['where'] );
+
+        $groupby = '';
 
         $pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );