tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9373 from manja/4.5

Browse Source 
Fixed issue with merging existing entities in text collector
This commit is contained in:
Robbie Averill 2020-01-14 09:27:35 -08:00 committed by GitHub
commit 38d7bd700d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/i18n/TextCollection/i18nTextCollector.php
View File

@ -378,8 +378,8 @@ class i18nTextCollector
// Merge // Merge
if ($existingMessages) { if ($existingMessages) {
$entitiesByModule[$module] = array_merge( $entitiesByModule[$module] = array_merge(
$existingMessages, $messages,
$messages $existingMessages
); );
} }
} }