Ticket #18200: no_plugin_overwrite.patch

wp-includes/l10n.php

@@ -425 +425 @@
                 $path = WP_PLUGIN_DIR;
         }
 
+        // Load the textdomain from the Plugin provided location, or plugin directory first
         $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
+        if ( $loaded = load_textdomain( $domain, $mofile ) )
+                return $loaded;
+
+        // Else, load textdomain from the Language directory
+        $mofile = WP_LANG_DIR . "/plugins/{$domain}-{$locale}.mo";
         return load_textdomain( $domain, $mofile );
 }
 
@@ -441 +447 @@
 function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
         $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
         $path = WPMU_PLUGIN_DIR . '/' . ltrim( $mu_plugin_rel_path, '/' );
-        load_textdomain( $domain, trailingslashit( $path ) . "$domain-$locale.mo" );
+
+        // Load the textdomain from the Plugin provided location, or plugin directory first
+        $mofile = trailingslashit( $path ) . "$domain-$locale.mo";
+        if ( $loaded = load_textdomain( $domain, $mofile ) )
+                return $loaded;
+
+        // Else, load textdomain from the Language directory
+        $mofile = WP_LANG_DIR . "/plugins/{$domain}-{$locale}.mo";
+        return load_textdomain( $domain, $mofile );
 }
 
 /**
@@ -464 +478 @@
 
         // Load the textdomain from the Theme provided location, or theme directory first
         $mofile = "{$path}/{$locale}.mo";
-        if ( $loaded = load_textdomain($domain, $mofile) )
+        if ( $loaded = load_textdomain( $domain, $mofile ) )
                 return $loaded;
 
         // Else, load textdomain from the Language directory
         $mofile = WP_LANG_DIR . "/themes/{$domain}-{$locale}.mo";
-        return load_textdomain($domain, $mofile);
+        return load_textdomain( $domain, $mofile );
 }
 
 /**