From 7a2e6d943e97817da06f89154ef22a6cd6c0a0c9 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Wed, 13 Jan 2016 05:33:06 +0100 Subject: [PATCH] Prevent loading text domain twice if the domain is already loaded on the plugins.php admin page. --- src/wp-admin/includes/plugin.php | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/wp-admin/includes/plugin.php b/src/wp-admin/includes/plugin.php index 415ef5b..c26acde 100644 --- a/src/wp-admin/includes/plugin.php +++ b/src/wp-admin/includes/plugin.php @@ -117,10 +117,14 @@ function _get_plugin_data_markup_translate( $plugin_file, $plugin_data, $markup // Translate fields if ( $translate ) { if ( $textdomain = $plugin_data['TextDomain'] ) { - if ( $plugin_data['DomainPath'] ) - load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] ); - else - load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) ); + if ( ! is_textdomain_loaded( $textdomain ) ) { + if ( $plugin_data['DomainPath'] ) { + load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) . $plugin_data['DomainPath'] ); + } + else { + load_plugin_textdomain( $textdomain, false, dirname( $plugin_file ) ); + } + } } elseif ( in_array( basename( $plugin_file ), array( 'hello.php', 'akismet.php' ) ) ) { $textdomain = 'default'; } -- 1.9.4.msysgit.2