From a673a71f94dd70a444e3ca62859e9ce7b27400f1 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Mon, 16 May 2016 15:10:29 +0000
Subject: [PATCH] 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.
Built from https://develop.svn.wordpress.org/trunk@37440


git-svn-id: http://core.svn.wordpress.org/trunk@37406 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/l10n.php    | 2 +-
 wp-includes/version.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/wp-includes/l10n.php b/wp-includes/l10n.php
index 7fa6638508..2023baa1d0 100644
--- a/wp-includes/l10n.php
+++ b/wp-includes/l10n.php
@@ -848,7 +848,7 @@ function _load_textdomain_just_in_time( $domain ) {
  */
 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 ];
 	}
 
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 737cfb352b..ee4f8d749d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-alpha-37439';
+$wp_version = '4.6-alpha-37440';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.