Changeset 5008

Timestamp:

02/24/2017 11:10:13 PM (8 years ago)

Author:

ocean90

Message:

Plugin Directory: Fix two incorrect cases when trying to match a HTTP header to a WordPress locale.

Includes tests.

Props SergeyBiryukov.
Fixes #1850.

Location:

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

Files:

• api/routes/class-locale-banner.php (modified) (2 diffs)
• tests/phpunit/tests/api/locale-banner.php (added)
• tests/phpunit/tests/wporg-plugin-api-performance.php (modified) (1 diff)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php

@@ -69 +69 @@
 
         // Build a list of WordPress locales which we'll suggest to the user.
-        $suggest_locales = array_values( array_intersect( $translated_locales, $locales_from_header ) );
+        $suggest_locales = array_values( array_intersect( $locales_from_header, $translated_locales ) );
         $current_locale_is_suggested = in_array( $current_locale, $suggest_locales );
         $current_locale_is_translated = in_array( $current_locale, $translated_locales );
@@ -263 +263 @@
 
         foreach ( $available_locales as $locale ) {
-            list( $lang, ) = preg_split( '/[_-]/', $locale );
-            if ( $lang  ) {
+            list( $locale_lang, ) = preg_split( '/[_-]/', $locale );
+            if ( $lang === $locale_lang ) {
                 return $locale;
             }

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/tests/phpunit/tests/wporg-plugin-api-performance.php

@@ -3 +3 @@
 require_once ABSPATH . 'wp-admin/includes/plugin-install.php';
 
-
 /**
- * @test
+ *
  * @group plugins-api
  * @group performance
  */
-
 class Tests_Plugins_API_Performance extends WP_UnitTestCase {