Changeset 15381

Timestamp:

07/10/2010 07:25:10 AM (14 years ago)

Author:

westi

Message:

Ensure the language selection dropdown is output correctly. Fixes #14255 for trunk props SergeyBiryukov.

File:

• trunk/wp-admin/includes/ms.php (modified) (2 diffs)

trunk/wp-admin/includes/ms.php

@@ -654 +654 @@
             $flag = true;
             $ae = __( 'American English' );
-            $output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . $ae . '</option>';
+            $output[$ae] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $ae . '</option>';
         } elseif ( $code_lang == 'en_GB' ) { // British English
             $flag = true;
             $be = __( 'British English' );
-            $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . $be . '</option>';
+            $output[$be] = '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . $be . '</option>';
         } else {
             $translated = format_code_lang( $code_lang );
-            $output[$translated] =  '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang ) . '> ' . esc_html ( $translated ) . '</option>';
+            $output[$translated] =  '<option value="' . esc_attr( $code_lang ) . '"' . selected( $current, $code_lang, false ) . '> ' . esc_html ( $translated ) . '</option>';
         }
 
@@ -667 +667 @@
 
     if ( $flag === false ) // WordPress english
-        $output[] = '<option value=""' . selected( $current, '' ) . '>' . __( 'English' ) . "</option>";
+        $output[] = '<option value=""' . selected( $current, '', false ) . '>' . __( 'English' ) . "</option>";
 
     // Order by name