Context Navigation

Back to Ticket #38482

Ticket #38482: 38168.3.diff

File 38168.3.diff, 1.1 KB (added by ocean90, 10 years ago)
+ comment

src/wp-admin/options.php

+        }
         if ( $options ) {
+                $user_language_old = get_user_locale();
                 foreach ( $options as $option ) {
                         if ( $unregistered ) {
                                 _deprecated_argument( 'options.php', '2.7.0',
 …
                         update_option( $option, $value );
+                }
                 // Switch translation in case WPLANG was changed.
                 $language      = get_option( 'WPLANG' );
                 $user_language = get_user_locale();
                 if ( $language === $user_language ) {
                         if ( $language ) {
                                 load_default_textdomain( $language );
                         } else {
                                 unload_textdomain( 'default' );
+                        }
+                /*
+                 * Switch translation in case WPLANG was changed.
+                 * The global $locale is used in get_locale() which is
+                 * used as a fallback in get_user_locale().
+                 */
+                unset( $GLOBALS['locale'] );
+                $user_language_new = get_user_locale();
+                if ( $user_language_old !== $user_language_new  ) {
+                        load_default_textdomain( $user_language_new );
+                }
+        }

Download in other formats:

Original Format

Make WordPress Core

Context Navigation

Ticket #38482: 38168.3.diff

src/wp-admin/options.php

Download in other formats: