Changeset 42734 for trunk/src/wp-includes/class-wp-theme.php

Timestamp:

02/25/2018 01:17:12 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Themes: Pre-translate theme names on Themes screen before sorting the array, to improve performance and avoid a warning in PHP 5.x.

Props bobbingwide, sebastian.pisula.
Fixes #34565.

File:

• trunk/src/wp-includes/class-wp-theme.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-theme.php

@@ -1560 +1560 @@
             uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
         } else {
+            foreach ( $themes as $key => $theme ) {
+                $theme->translate_header( 'Name', $theme->headers['Name'] );
+            }
             uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );
         }
@@ -1584 +1587 @@
 
     /**
-     * Name sort (with translation).
+     * Callback function for usort() to naturally sort themes by translated name.
      *
      * @since 3.4.0
@@ -1596 +1599 @@
      */
     private static function _name_sort_i18n( $a, $b ) {
-        // Don't mark up; Do translate.
-        return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
+        return strnatcasecmp( $a->name_translated, $b->name_translated );
     }
 }