diff --git a/classes/Configuration/Configuration.php b/classes/Configuration/Configuration.php index 9e56952d3b..172d66188f 100644 --- a/classes/Configuration/Configuration.php +++ b/classes/Configuration/Configuration.php @@ -131,6 +131,12 @@ class Configuration extends Loggable implements iConfiguration protected $localConfigDir = null; + + /** + * @var array of filenames of local configuration files + */ + protected $localConfigFiles = array(); + /** * @var boolean Flag indicating that the directory for local configuration files has been * scanned and the list of filenames has been stored for use. diff --git a/classes/ETL/Configuration/EtlConfiguration.php b/classes/ETL/Configuration/EtlConfiguration.php index 4803bb1b21..b7e85a0994 100644 --- a/classes/ETL/Configuration/EtlConfiguration.php +++ b/classes/ETL/Configuration/EtlConfiguration.php @@ -525,9 +525,9 @@ protected function postMergeTasks() * ------------------------------------------------------------------------------------------ */ - public function cleanup() + public function cleanup($deepCleanup = false) { - parent::cleanup(); + parent::cleanup($deepCleanup); $this->parentDefaults = null; } // cleanup()