From edf9c86890b4da923297c8ba46c7aa8d84af5a46 Mon Sep 17 00:00:00 2001 From: Johannes Pichler Date: Wed, 2 Mar 2016 20:44:39 +0100 Subject: [PATCH] update defaults configuration --- Mage/Config.php | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/Mage/Config.php b/Mage/Config.php index 6133578..18e45c3 100644 --- a/Mage/Config.php +++ b/Mage/Config.php @@ -157,18 +157,13 @@ class Config } /** - * Returns the default deployment configuration from general configuration + * Returns the default environment configuration from general configuration * - * @return array the default deployment configuration + * @return array the default environment configuration */ protected function getDefaultEnvironment() { $defaults = $this->general('defaults', null); - - if(!empty($defaults) && array_key_exists('deployment', $defaults)) { - return $defaults['deployment']; - } - - return array(); + return !empty($defaults) ? $defaults : array(); } /**