mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-25 10:33:18 +01:00
Code Issues Releases Wiki Activity

[Service] Fixing config file aliases for JSON includes

Browse Source
This commit is contained in:
Michael Dowling 2012-09-07 10:24:07 -07:00
parent 0318412538
commit e850c7ddba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Guzzle/Service/JsonLoader.php
View File

@ -59,7 +59,7 @@ class JsonLoader
// Handle includes
if (!empty($data['includes'])) {
foreach ($data['includes'] as $path) {
if ($path[0] != DIRECTORY_SEPARATOR) {
if ($path[0] != DIRECTORY_SEPARATOR && !isset($this->aliases[$path])) {
$path = dirname($jsonFile) . DIRECTORY_SEPARATOR . $path;
}
$data = $this->mergeJson($this->parseJsonFile($path), $data);