Changeset 36538

Timestamp:

02/16/2016 09:14:45 PM (11 years ago)

Author:

ocean90

Message:

i18n: Prevent is_textdomain_loaded() from returning true even if there are no translations for the domain.

In get_translations_for_domain() don't fill the global $l10n with NOOP_Translations instances, return a NOOP_Translations instance instead.

Props nacin, jrf.
Fixes #21319.

Location:

trunk

Files:

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

trunk/src/wp-includes/l10n.php

@@ -794 +794 @@
 function get_translations_for_domain( $domain ) {
         global $l10n;
-        if ( !isset( $l10n[$domain] ) ) {
-                $l10n[$domain] = new NOOP_Translations;
-        }
-        return $l10n[$domain];
+        if ( isset( $l10n[ $domain ] ) ) {
+                return $l10n[ $domain ];
+        }
+
+        static $noop_translations = null;
+        if ( null === $noop_translations ) {
+                $noop_translations = new NOOP_Translations;
+        }
+
+        return $noop_translations;
 }
 
@@ -812 +818 @@
 function is_textdomain_loaded( $domain ) {
         global $l10n;
-        return isset( $l10n[$domain] );
+        return isset( $l10n[ $domain ] );
 }
 

trunk/tests/phpunit/tests/l10n.php

@@ -27 +27 @@
         }
 
+        /**
+         * @ticket 21319
+         */
+        function test_is_textdomain_loaded_for_no_translations() {
+                $this->assertFalse( load_textdomain( 'wp-tests-domain', DIR_TESTDATA . '/non-existent-file' ) );
+                $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
+                $this->assertInstanceOf( 'NOOP_Translations', get_translations_for_domain( 'wp-tests-domain' ) );
+                // Ensure that we don't confuse NOOP_Translations to be a loaded text domain.
+                $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
+                $this->assertFalse( unload_textdomain( 'wp-tests-domain' ) );
+        }
+
+        /**
+         * @ticket 21319
+         */
+        function test_is_textdomain_is_not_loaded_after_gettext_call_with_no_translations() {
+                $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
+                __( 'just some string', 'wp-tests-domain' );
+                $this->assertFalse( is_textdomain_loaded( 'wp-tests-domain' ) );
+        }
 }