Ticket #37113: 37113.diff

src/wp-includes/l10n.php

@@ -571 +571 @@
  *
  * @since 3.0.0
  *
- * @global array $l10n
+ * @global array $l10n          An array of all currently loaded text domains.
+ * @global array $l10n_unloaded An array of all text domains that have been unloaded again.
  *
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool Whether textdomain was unloaded.
  */
 function unload_textdomain( $domain ) {
-        global $l10n;
+        global $l10n, $l10n_unloaded;
 
         /**
          * Filters whether to override the text domain unloading.
@@ -603 +604 @@
 
         if ( isset( $l10n[$domain] ) ) {
                 unset( $l10n[$domain] );
+
+                $l10n_unloaded = (array) $l10n_unloaded;
+                $l10n_unloaded[] = $domain;
+
                 return true;
         }
 
@@ -793 +798 @@
  * @access private
  *
  * @see get_translations_for_domain()
+ * @global array $l10n_unloaded An array of all text domains that have been unloaded again.
  *
  * @param string $domain Text domain. Unique identifier for retrieving translated strings.
  * @return bool True when the textdomain is successfully loaded, false otherwise.
  */
 function _load_textdomain_just_in_time( $domain ) {
+        global $l10n_unloaded;
+
         static $cached_mofiles = null;
 
         // Short-circuit if domain is 'default' which is reserved for core.
-        if ( 'default' === $domain ) {
+        if ( 'default' === $domain || in_array( $domain, (array) $l10n_unloaded ) ) {
                 return false;
         }
 

tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -100 +100 @@
 
                 $this->assertTrue( $translations instanceof NOOP_Translations );
         }
+
+        /**
+         * @ticket 37113
+         */
+        public function test_should_allow_unloading_of_text_domain() {
+                add_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+                require_once DIR_TESTDATA . '/plugins/internationalized-plugin.php';
+
+                load_textdomain( 'internationalized-plugin', WP_LANG_DIR . '/plugins/internationalized-plugin-de_DE.mo' );
+
+                $expected_output      = i18n_plugin_test();
+                $is_textdomain_loaded = is_textdomain_loaded( 'internationalized-plugin' );
+
+                unload_textdomain( 'internationalized-plugin' );
+                remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+                $this->assertSame( 'Das ist ein Dummy Plugin', $expected_output );
+                $this->assertTrue( $is_textdomain_loaded );
+
+                $this->assertFalse( is_textdomain_loaded( 'internationalized-plugin' ) );
+                $this->assertSame( 'This is a dummy plugin', i18n_plugin_test() );
+        }
 }