CRM-18231 Remove need for define statement and replace with new setting not settable...

[civicrm-core.git] / CRM / Core / Config.php

diff --git a/CRM/Core/Config.php b/CRM/Core/Config.php
index 2a61e5eb30a43c745f723c559c74974a9ae8772d..bc567631b88952116778aebe9224fba63d9d9efa 100644 (file)
--- a/CRM/Core/Config.php
+++ b/CRM/Core/Config.php
@@ -274,14 +274,7 @@ class CRM_Core_Config extends CRM_Core_Config_MagicMerge {
       $environment = $env;
     }
     if ($reset || empty($environment)) {
-      if (defined('CIVICRM_ENVIRONMENT')) {
-        $environment = CIVICRM_ENVIRONMENT;
-        global $civicrm_setting;
-        $civicrm_setting[CRM_Core_BAO_Setting::DEVELOPER_PREFERENCES_NAME]['environment'] = $environment;
-      }
-      else {
-        $environment = Civi::settings()->get('environment');
-      }
+      $environment = Civi::settings()->get('environment');
     }
     if (!$environment) {
       $environment = 'Production';