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

Timestamp:

02/24/2017 11:10:13 PM (10 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.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-locale-banner.php (modified) (2 diffs)

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;
                         }