Changeset 10442

Timestamp:

11/12/2020 06:20:16 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: i18n: Simplify the querying of the original strings.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php (modified) (4 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-i18n.php

@@ -176 +176 @@
 
         if ( false !== ( $originals = $this->cache_get( $slug, $branch, $cache_suffix ) ) ) {
+            if ( isset( $originals[0] ) ) {
+                // old cache style.
+                foreach ( $originals as $i => $o ) {
+                    $originals[ $o->id ] = $o->singular;
+                    unset( $originals[ $i ] ); // Safe: Original IDs are huge for plugins.
+                }
+            }
+
             return $originals;
         }
@@ -186 +194 @@
 
         $originals = $wpdb->get_results( $wpdb->prepare(
-            'SELECT id, singular, comment FROM ' . GLOTPRESS_TABLE_PREFIX . 'originals WHERE project_id = %d AND status = %s ORDER BY CHAR_LENGTH(singular) DESC',
+            'SELECT id, singular FROM ' . GLOTPRESS_TABLE_PREFIX . 'originals WHERE project_id = %d AND status = %s ORDER BY CHAR_LENGTH(singular) DESC',
             $branch_id, '+active'
-        ) );
-
-        if ( empty( $originals ) ) {
-
-            // Still cache if empty, but as array, never false.
-            $originals = array();
-        }
+        ), ARRAY_A );
+
+        $originals = array_column( $originals, 'singular', 'id' );
 
         $this->cache_set( $slug, $branch, $originals, $cache_suffix );
@@ -408 +412 @@
         // Sort the originals so as to process long strings first.
         uasort( $originals, function( $a, $b ) {
-            $a_len = strlen( $a->singular );
-            $b_len = strlen( $b->singular );
+            $a_len = strlen( $a );
+            $b_len = strlen( $b );
 
             return $a_len == $b_len ? 0 : ($a_len > $b_len ? -1 : 1);
@@ -415 +419 @@
 
         // Mark each original for translation
-        foreach ( $originals as $original ) {
-            if ( ! empty( $original->id ) && array_key_exists( $original->id, $translations ) ) {
-                $content = $this->mark_gp_original( $original->id, $original->singular, $content );
+        foreach ( $originals as $original_id => $original ) {
+            if ( isset( $translations[ $original_id ] ) ) {
+                $content = $this->mark_gp_original( $original_id, $original, $content );
             }
         }