Ticket #49263: 49263.1.diff

src/wp-includes/class-wp-locale-switcher.php

@@ -71 +71 @@
         public function switch_to_locale( $locale ) {
                 $current_locale = determine_locale();
                 if ( $current_locale === $locale ) {
+                        var_dump( compact( 'current_locale', 'locale' ) );
+                        echo 'ret early equal <br>';
                         return false;
                 }
 
                 if ( ! in_array( $locale, $this->available_languages, true ) ) {
+                        echo 'ret early not avail <br>';
                         return false;
                 }
 

src/wp-includes/l10n.php

@@ -25 +25 @@
  * @global string $locale
  * @global string $wp_local_package
  *
+ * @param
  * @return string The locale of the blog or from the {@see 'locale'} hook.
  */
-function get_locale() {
+function get_locale( $use_cache = true ) {
         global $locale, $wp_local_package;
 
-        if ( isset( $locale ) ) {
+        if ( isset( $locale ) && $use_cache ) {
                 /**
                  * Filters the locale ID of the WordPress installation.
                  *
@@ -41 +42 @@
                 return apply_filters( 'locale', $locale );
         }
 
+        // start modularize ?
         if ( isset( $wp_local_package ) ) {
                 $locale = $wp_local_package;
         }
@@ -75 +77 @@
         if ( empty( $locale ) ) {
                 $locale = 'en_US';
         }
+        // end modularize ?
 
         /** This filter is documented in wp-includes/l10n.php */
         return apply_filters( 'locale', $locale );

src/wp-includes/ms-blogs.php

@@ -486 +486 @@
  *
  * @param int  $new_blog_id The ID of the blog to switch to. Default: current blog.
  * @param bool $deprecated  Not used.
+ * @param what to name it?
  * @return true Always returns true.
  */
-function switch_to_blog( $new_blog_id, $deprecated = null ) {
+function switch_to_blog( $new_blog_id, $deprecated = null, $options = array() ) {
         global $wpdb;
 
+        // better name - flags? switches? what_to_switch? there's gotta be something more descriptive
+
+        $default_options = array(
+                'blog_id'      => true, // any valid use case for this being false?
+                'table_prefix' => true, // any valid use case for this being false?
+                'object_cache' => true,
+                'locale'       => false,
+        );
+
+        // add filter for default options?
+
+        // document filter
+        $options = apply_filters(
+                'switch_blog_options',
+                wp_parse_args( $options, $default_options )
+        );
+
+        // add conditions around everything based on existing options
+
         $prev_blog_id = get_current_blog_id();
         if ( empty( $new_blog_id ) ) {
                 $new_blog_id = $prev_blog_id;
@@ -514 +534 @@
                  * @param int    $prev_blog_id Previous blog ID.
                  * @param string $context      Additional context. Accepts 'switch' when called from switch_to_blog()
                  *                             or 'restore' when called from restore_current_blog().
+                 * @param array $optons        explain
                  */
-                do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'switch' );
+                do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'switch', $options );
                 $GLOBALS['switched'] = true;
+//              var_dump( $new_blog_id, $prev_blog_id );
+//              die('early');
                 return true;
         }
 
@@ -546 +569 @@
                 }
         }
 
+        if ( true === $options['locale'] ) {
+                $new_locale = get_locale( false );
+                // doing this resets global $locale, so determine_locale() thinks its equal and switch_to_locale() returns early.
+                // could add a $force param to switch_locale(), or pass param to get_locale() to tell it to not update global $locale, but not very elegant
+                // maybe modularize the get_locale logic so you can reuse the inner stuff w/out setting the global var?
+
+                // could also add a `locale` filter and then remove it, but not very elegant
+
+                // modularizing get_locale seems like might be better approach - _get_fresh_locale() or _get_raw_locale()
+                        // should be internal?
+
+
+
+
+                switch_to_locale( $new_locale );
+        }
+
         /** This filter is documented in wp-includes/ms-blogs.php */
-        do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'switch' );
+        do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'switch', $options );
         $GLOBALS['switched'] = true;
 
         return true;
@@ -571 +611 @@
 function restore_current_blog() {
         global $wpdb;
 
+        // need a param here to determine what to restore?
+        // or just restore everything? - can't b/c
+        // or just automatically restonre what the last switch enabled, but do automatically w/out asking ?
+
         if ( empty( $GLOBALS['_wp_switched_stack'] ) ) {
                 return false;
         }
@@ -613 +657 @@
                 }
         }
 
+        if ( true ) { // how to determine?
+                restore_current_locale();
+        }
+
         /** This filter is documented in wp-includes/ms-blogs.php */
         do_action( 'switch_blog', $new_blog_id, $prev_blog_id, 'restore' );
 

tests/phpunit/tests/multisite/site.php

@@ -133 +133 @@
                         $this->assertFalse( restore_current_blog() );
                 }
 
+                // document
+
+                /**
+                 *
+                 * @group switch_to_blog
+                 */
+                function test_switch_blog_locale() {
+                        // maybe need data provider to toggle all the individual flags
+                        $this->assertTrue( is_main_site() );
+                        $this->assertEquals( 'en_US', get_locale() );
+                        $this->assertEquals( 'en_US', get_user_locale() );
+
+                        $blog_id = self::factory()->blog->create();
+                        // set locale to es_MX ; need to modify factory to allow passing that to constructor, b/c doing switch_to_blog and update_option() would kinda default the point?
+
+                        // tes probably failing b/c not auto copying files over
+
+
+                        switch_to_blog( $blog_id, null, array( 'locale' => true ) );
+
+                        $this->assertEquals( 'es_MX', get_locale() );
+                        $this->assertEquals( 'es_MX', get_user_locale() );
+                        // test actually translating a string?
+
+                        // handle plugin/theme textdomains
+
+                        restore_current_blog();
+
+
+                        // test w/ user_locale on/off?
+                        // test during installation? at least manually
+                }
+
                 /**
                  * Test the cache keys and database tables setup through the creation of a site.
                  */