Changeset 52218

Timestamp:

11/19/2021 06:58:14 PM (3 years ago)

Author:

hellofromTonya

Message:

WPDB: Call wp_load_translations_early() in wpdb::query() and wpdb::process_fields().

For consistency and simplification, replaces the function_exists( '__' ) checks with wp_load_translations_early() to make sure i18n functions are available. This change removes the extra code introduced in [52176] for using non-translated error messages when __() is not available.

Improves the plural versions of the error messages.

For performance, when there are more than one problem field, uses reset() to populate the field in the error message.

Follow-up to [52176], [52195].

Props sergeybiryukov, hellofromTonya.
Fixes #32315.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (2 diffs)
• tests/phpunit/tests/db.php (modified) (1 diff)

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

@@ -2018 +2018 @@
                 $this->last_query = $query;
 
-                if ( function_exists( '__' ) ) {
-                    $this->last_error = __( 'WordPress database error: Could not perform query because it contains invalid data.' );
-                } else {
-                    $this->last_error = 'WordPress database error: Could not perform query because it contains invalid data.';
-                }
+                wp_load_translations_early();
+
+                $this->last_error = __( 'WordPress database error: Could not perform query because it contains invalid data.' );
 
                 return false;
@@ -2551 +2549 @@
             }
 
+            wp_load_translations_early();
+
             if ( 1 === count( $problem_fields ) ) {
-                if ( function_exists( '__' ) ) {
-                    /* translators: %s Database field where the error occurred. */
-                    $message = __( 'WordPress database error: Processing the value for the following field failed: %s. The supplied value may be too long or contains invalid data.' );
-                } else {
-                    $message = 'WordPress database error: Processing the value for the following field failed: %s. The supplied value may be too long or contains invalid data.';
-                }
+                $this->last_error = sprintf(
+                    /* translators: %s: Database field where the error occurred. */
+                    __( 'WordPress database error: Processing the value for the following field failed: %s. The supplied value may be too long or contains invalid data.' ),
+                    reset( $problem_fields )
+                );
             } else {
-                if ( function_exists( '__' ) ) {
-                    /* translators: %s Database fields where the error occurred. */
-                    $message = __( 'WordPress database error: Processing the value for the following fields failed: %s. The supplied value may be too long or contains invalid data.' );
-                } else {
-                    $message = 'WordPress database error: Processing the value for the following fields failed: %s. The supplied value may be too long or contains invalid data.';
-                }
-            }
-
-            $this->last_error = sprintf( $message, implode( ', ', $problem_fields ) );
+                $this->last_error = sprintf(
+                    /* translators: %s: Database fields where the error occurred. */
+                    __( 'WordPress database error: Processing the values for the following fields failed: %s. The supplied values may be too long or contain invalid data.' ),
+                    implode( ', ', $problem_fields )
+                );
+            }
 
             return false;

trunk/tests/phpunit/tests/db.php

@@ -1190 +1190 @@
      */
     private function get_db_error_value_too_long( $errored_fields ) {
+        if ( str_contains( $errored_fields, ', ' ) ) {
+            return sprintf(
+                'WordPress database error: Processing the values for the following fields failed: %s. ' .
+                'The supplied values may be too long or contain invalid data.',
+                $errored_fields
+            );
+        }
         return sprintf(
-            'WordPress database error: Processing the value for the following field%s failed: %s. ' .
+            'WordPress database error: Processing the value for the following field failed: %s. ' .
             'The supplied value may be too long or contains invalid data.',
-            str_contains( $errored_fields, ', ' ) ? 's' : '',
             $errored_fields
         );