Changeset 10443

Timestamp:

11/12/2020 06:31:48 AM (5 years ago)

Author:

dd32

Message:

Plugin Directory: i18n: A second attempt at cache back-compat handling.

Amends r10442.

File:

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

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.
-                }
+            if ( $originals && is_object( $originals[ array_keys($originals)[0] ] ) ) {
+                $originals = array_column( $originals, 'singular', 'id' );
             }