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

MINOR Removed duplicated code in i18nTextCollector, more defensive checks for get_owner_module()

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@104992 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2010-05-17 03:17:09 +00:00 committed by Sam Minnee
parent 416c8fcc2a
commit a809289a25
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/i18nTextCollector.php
View File

@ -94,6 +94,7 @@ class i18nTextCollector extends Object {
// we store the master string tables // we store the master string tables
$processedEntities = $this->processModule($module); $processedEntities = $this->processModule($module);
if(isset($entitiesByModule[$module])) { if(isset($entitiesByModule[$module])) {
$entitiesByModule[$module] = array_merge_recursive($entitiesByModule[$module], $processedEntities); $entitiesByModule[$module] = array_merge_recursive($entitiesByModule[$module], $processedEntities);
} else { } else {
@ -102,24 +103,14 @@ class i18nTextCollector extends Object {
// extract all entities for "foreign" modules (fourth argument) // extract all entities for "foreign" modules (fourth argument)
foreach($entitiesByModule[$module] as $fullName => $spec) { foreach($entitiesByModule[$module] as $fullName => $spec) {
if(isset($spec[3]) && $spec[3] != $module) { if(isset($spec[3]) && $spec[3] && $spec[3] != $module) {
$othermodule = $spec[3]; $othermodule = $spec[3];
if(!isset($entitiesByModule[$othermodule])) $entitiesByModule[$othermodule] = array(); if(!isset($entitiesByModule[$othermodule])) $entitiesByModule[$othermodule] = array();
unset($spec[3]); unset($spec[3]);
$entitiesByModule[$othermodule][$fullName] = $spec; $entitiesByModule[$othermodule][$fullName] = $spec;
unset($entitiesByModule[$module][$fullName]); unset($entitiesByModule[$module][$fullName]);
} }
} }
// extract all entities for "foreign" modules (fourth argument)
foreach($entitiesByModule[$module] as $fullName => $spec) {
if(isset($spec[3]) && $spec[3] != $module) {
$othermodule = $spec[3];
if(!isset($entitiesByModule[$othermodule])) $entitiesByModule[$othermodule] = array();
unset($spec[3]);
$entitiesByModule[$othermodule][$fullName] = $spec;
}
}
} }
// Write the generated master string tables // Write the generated master string tables