Ticket #10527: 10527.patch

wp-includes/l10n.php

@@ -314 +314 @@
  *
  * @param string $domain Unique identifier for retrieving translated strings
  * @param string $mofile Path to the .mo file
+ * @param bool   $merge (optional) flag wether or not to merge the .mo file with an textdomain in nemory. default is false.
  * @return bool true on success, false on failure
  */
-function load_textdomain($domain, $mofile) {
+function load_textdomain($domain, $mofile, $merge = false) {
         global $l10n;
 
         if ( !is_readable( $mofile ) ) return false;
+        
+        if ( isset( $l10n[$domain] ) && false == $merge )
+                return true;
 
         $mo = new MO();
         if ( !$mo->import_from_file( $mofile ) ) return false;
@@ -359 +363 @@
  * @param string $abs_rel_path Optional. Relative path to ABSPATH of a folder,
  *      where the .mo file resides. Deprecated, but still functional until 2.7
  * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precendence over $abs_rel_path
+ * @param bool   $merge (optional) flag wether or not to merge the .mo file with an textdomain in nemory. default is false.
+ * @return bool  true on success, false on failure  
  */
-function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) {
+function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false, $merge = false) {
         $locale = get_locale();
 
         if ( false !== $plugin_rel_path )
@@ -371 +377 @@
                 $path = WP_PLUGIN_DIR;
 
         $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
-        return load_textdomain($domain, $mofile);
+        return load_textdomain($domain, $mofile, $merge);
 }
 
 /**