Changeset 37440

Timestamp:

05/16/2016 03:09:33 PM (10 years ago)

Author:

ocean90

Message:

I18N: In get_translations_for_domain() check if the global $l10n was set by _load_textdomain_just_in_time() before accessing it.

Props danielhuesken.
Fixes #34114.

Location:

trunk

Files:

• src/wp-includes/l10n.php (modified) (1 diff)
• tests/phpunit/tests/l10n/loadTextdomainJustInTime.php (modified) (3 diffs)

trunk/src/wp-includes/l10n.php

@@ -849 +849 @@
 function get_translations_for_domain( $domain ) {
         global $l10n;
-        if ( isset( $l10n[ $domain ] ) || _load_textdomain_just_in_time( $domain ) ) {
+        if ( isset( $l10n[ $domain ] ) || ( _load_textdomain_just_in_time( $domain ) && isset( $l10n[ $domain ] ) ) ) {
                 return $l10n[ $domain ];
         }

trunk/tests/phpunit/tests/l10n/loadTextdomainJustInTime.php

@@ -59 +59 @@
                 $is_textdomain_loaded_after  = is_textdomain_loaded( 'internationalized-plugin' );
 
+                unload_textdomain( 'internationalized-plugin' );
                 remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
 
@@ -80 +81 @@
                 $is_textdomain_loaded_after  = is_textdomain_loaded( 'internationalized-theme' );
 
+                unload_textdomain( 'internationalized-theme' );
                 remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
 
@@ -86 +88 @@
                 $this->assertTrue( $is_textdomain_loaded_after );
         }
+
+        /**
+         * @ticket 341142
+         */
+        public function test_get_translations_for_domain_does_not_return_null_if_override_load_textdomain_is_used() {
+                add_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+                add_filter( 'override_load_textdomain', '__return_true' );
+                $translations = get_translations_for_domain( 'internationalized-plugin' );
+                remove_filter( 'override_load_textdomain', '__return_true' );
+                remove_filter( 'locale', array( $this, 'filter_set_locale_to_german' ) );
+
+                $this->assertTrue( $translations instanceof NOOP_Translations );
+        }
 }