Changeset 44166 for trunk/src/wp-includes/class-wp-site-query.php

Timestamp:

12/14/2018 05:12:12 AM (6 years ago)

Author:

desrosj

Message:

PHP7.3 compatibility: Fix compact throwing notices.

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.

Props jorbin, desrosj.

Merges [43819] and [43832] to trunk.

Fixes #44416.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/wp-includes/class-wp-site-query.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp-site-query.php

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