Only process extends if not a local config file

ubccr · Mar 7, 2019 · 6ded7d8 · 6ded7d8
1 parent 36175b3
commit 6ded7d8
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/classes/Configuration/XdmodConfiguration.php b/classes/Configuration/XdmodConfiguration.php
@@ -69,17 +69,18 @@ protected function processExtends()
  {
  // This objects `transformedConfig` may be an object or an array of objects, this is handled
  // by the following `if/elseif` statement.
- if (is_array($this->transformedConfig)) {
- foreach($this->transformedConfig as $key => &$value) {
- if (is_object($value)) {
- $this->handleExtendsFor($value);
+ if (!$this->isLocalConfig) {
+ if (is_array($this->transformedConfig)) {
+ foreach($this->transformedConfig as $key => &$value) {
+ if (is_object($value)) {
+ $this->handleExtendsFor($value);
+ }
  }
- }
 
- } elseif(is_object($this->transformedConfig)) {
- $this->handleExtendsFor($this->transformedConfig);
+ } elseif(is_object($this->transformedConfig)) {
+ $this->handleExtendsFor($this->transformedConfig);
+ }
  }
-
  } // processExtends
 
  /**