WordPress.org

Make WordPress Core

Ticket #10286: 10286.diff

File 10286.diff, 411 bytes (added by rovo89, 5 years ago)

New translations overwrite existing ones

  • wp-includes/l10n.php

     
    327327        $mo->import_from_file( $mofile ); 
    328328 
    329329        if (isset($l10n[$domain])) 
    330                 $mo->merge_with( $l10n[$domain] ); 
    331  
    332         $l10n[$domain] = &$mo; 
     330                $l10n[$domain]->merge_with( $mo ); 
     331        else 
     332                $l10n[$domain] = &$mo; 
    333333} 
    334334 
    335335/**