Loading from both paths first found wins

phiamo · phiamo · commit eaa1a5f164fb · 2014-07-24T10:21:05.000+02:00
diff --git a/DependencyInjection/CmfCreateExtension.php b/DependencyInjection/CmfCreateExtension.php
@@ -64,11 +64,10 @@ public function load(array $configs, ContainerBuilder $container)
                 if (file_exists($rdfMappingDir)) {
                     $config['rdf_config_dirs'][] = $rdfMappingDir;
                 }
-                else {
-                    $rdfMappingDir = dirname($bundle->getFilename()).'/Resources/rdf-mappings';
-                    if (file_exists($rdfMappingDir)) {
-                        $config['rdf_config_dirs'][] = $rdfMappingDir;
-                    }
+
+                $rdfMappingDir = dirname($bundle->getFilename()).'/Resources/rdf-mappings';
+                if (file_exists($rdfMappingDir)) {
+                    $config['rdf_config_dirs'][] = $rdfMappingDir;
                 }
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -64,11 +64,10 @@ public function load(array $configs, ContainerBuilder $container)`
`64`	`64`	`if (file_exists($rdfMappingDir)) {`
`65`	`65`	`$config['rdf_config_dirs'][] = $rdfMappingDir;`
`66`	`66`	`}`
`67`		`- else {`
`68`		`- $rdfMappingDir = dirname($bundle->getFilename()).'/Resources/rdf-mappings';`
`69`		`- if (file_exists($rdfMappingDir)) {`
`70`		`- $config['rdf_config_dirs'][] = $rdfMappingDir;`
`71`		`- }`
	`67`	`+`
	`68`	`+ $rdfMappingDir = dirname($bundle->getFilename()).'/Resources/rdf-mappings';`
	`69`	`+ if (file_exists($rdfMappingDir)) {`
	`70`	`+ $config['rdf_config_dirs'][] = $rdfMappingDir;`
`72`	`71`	`}`
`73`	`72`	`}`
`74`	`73`	`}`