Skip to content

Commit

Permalink
Merge pull request #1 from joeyhub/joeyhub-patch-1
Browse files Browse the repository at this point in the history
Pass through string handling when adapter not set.
  • Loading branch information
joeyhub authored Jan 11, 2019
2 parents b7e3378 + 1e31469 commit 3d9e622
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions phalcon/config/adapter/grouped.zep
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,11 @@ class Grouped extends Config

// Set to default adapter if passed as string
if typeof configName === "string" {
if defaultAdapter === null {
this->_merge(Factory::load(configName));
continue;
}

let configInstance = ["filePath" : configName, "adapter" : defaultAdapter];
} elseif !isset configInstance["adapter"] {
let configInstance["adapter"] = defaultAdapter;
Expand Down

0 comments on commit 3d9e622

Please sign in to comment.