Changeset 29669

Timestamp:

09/02/2014 08:09:56 AM (12 years ago)

Author:

SergeyBiryukov

Message:

Re-initialize $wp_locale global after changing the default textdomain on installation screens.

props ocean90.
fixes #29452.

Location:

trunk/src/wp-admin

Files:

• install.php (modified) (2 diffs)
• setup-config.php (modified) (3 diffs)

trunk/src/wp-admin/install.php

@@ -205 +205 @@
                         if ( $loaded_language ) {
                                 load_default_textdomain( $loaded_language );
+                                $GLOBALS['wp_locale'] = new WP_Locale();
                         }
                 }
@@ -222 +223 @@
                 if ( ! empty( $langugage ) && load_default_textdomain( $langugage ) ) {
                         $loaded_language = $langugage;
+                        $GLOBALS['wp_locale'] = new WP_Locale();
                 } else {
                         $loaded_language = 'en_US';

trunk/src/wp-admin/setup-config.php

@@ -111 +111 @@
                         if ( $loaded_language ) {
                                 load_default_textdomain( $loaded_language );
+                                $GLOBALS['wp_locale'] = new WP_Locale();
                         }
                 }
@@ -145 +146 @@
         case 1:
                 load_default_textdomain( $language );
+                $GLOBALS['wp_locale'] = new WP_Locale();
+
                 setup_config_display_header();
         ?>
@@ -185 +188 @@
         case 2:
         load_default_textdomain( $language );
+        $GLOBALS['wp_locale'] = new WP_Locale();
+
         $dbname = trim( wp_unslash( $_POST[ 'dbname' ] ) );
         $uname = trim( wp_unslash( $_POST[ 'uname' ] ) );