Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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.
Built from https://develop.svn.wordpress.org/trunk@36538


git-svn-id: http://core.svn.wordpress.org/trunk@36505 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2016-02-16 21:15:29 +00:00
parent 008cba0333
commit 51473acfb3
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-includes/l10n.php
View File

@ -793,10 +793,16 @@ function load_child_theme_textdomain( $domain, $path = false ) {
*/ */
function get_translations_for_domain( $domain ) { function get_translations_for_domain( $domain ) {
global $l10n; global $l10n;
if ( !isset( $l10n[$domain] ) ) { if ( isset( $l10n[ $domain ] ) ) {
$l10n[$domain] = new NOOP_Translations; return $l10n[ $domain ];
} }
return $l10n[$domain];
static $noop_translations = null;
if ( null === $noop_translations ) {
$noop_translations = new NOOP_Translations;
}
return $noop_translations;
} }
/** /**
@ -811,7 +817,7 @@ function get_translations_for_domain( $domain ) {
*/ */
function is_textdomain_loaded( $domain ) { function is_textdomain_loaded( $domain ) {
global $l10n; global $l10n;
return isset( $l10n[$domain] ); return isset( $l10n[ $domain ] );
} }
/** /**

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36537'; $wp_version = '4.5-alpha-36538';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.