Changeset 36282

Timestamp:

01/13/2016 01:03:21 PM (9 years ago)

Author:

ocean90

Message:

Plugins: In _get_plugin_data_markup_translate() don't reload translations if they're already loaded.

Props jrf.
Fixes #35439.

File:

• trunk/src/wp-admin/includes/plugin.php (modified) (1 diff)

trunk/src/wp-admin/includes/plugin.php

@@ -118 +118 @@
     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';