Changeset 51396

Timestamp:

07/10/2021 11:14:46 AM (5 years ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Only check collation in wpdb methods if the query is not empty.

This avoids a deprecation notice on PHP 8.1 caused by passing null instead of a string to ltrim() in wpdb::check_safe_collation(), and maintains the current behaviour.

Follow-up to [30345], [32162], [33455].

See #53635.

File:

• trunk/src/wp-includes/wp-db.php (modified) (4 diffs)

trunk/src/wp-includes/wp-db.php

@@ -2574 +2574 @@
                 $this->func_call = "\$db->get_var(\"$query\", $x, $y)";
 
-                if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
-                        $this->check_current_query = false;
-                }
-
                 if ( $query ) {
+                        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+                                $this->check_current_query = false;
+                        }
+
                         $this->query( $query );
                 }
@@ -2608 +2608 @@
                 $this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 
-                if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
-                        $this->check_current_query = false;
-                }
-
                 if ( $query ) {
+                        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+                                $this->check_current_query = false;
+                        }
+
                         $this->query( $query );
                 } else {
@@ -2650 +2650 @@
          */
         public function get_col( $query = null, $x = 0 ) {
-                if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
-                        $this->check_current_query = false;
-                }
-
                 if ( $query ) {
+                        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+                                $this->check_current_query = false;
+                        }
+
                         $this->query( $query );
                 }
@@ -2688 +2688 @@
                 $this->func_call = "\$db->get_results(\"$query\", $output)";
 
-                if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
-                        $this->check_current_query = false;
-                }
-
                 if ( $query ) {
+                        if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+                                $this->check_current_query = false;
+                        }
+
                         $this->query( $query );
                 } else {