CRM-21698 move formatting to processor class.

[civicrm-core.git] / CRM / Cxn / ApiRouter.php

diff --git a/CRM/Cxn/ApiRouter.php b/CRM/Cxn/ApiRouter.php
index 5642a0a56efa60c1f7961622120667c7c319b632..63a1a7572bd47b5ac9fe5d596dbb935035a65619 100644 (file)
--- a/CRM/Cxn/ApiRouter.php
+++ b/CRM/Cxn/ApiRouter.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.7                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2015                                |
+ | Copyright CiviCRM LLC (c) 2004-2017                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -46,7 +46,7 @@ class CRM_Cxn_ApiRouter {
     require_once 'api/v3/utils.php';
 
     // FIXME: Shouldn't the X-Forwarded-Proto check be part of CRM_Utils_System::isSSL()?
-    if (CRM_Core_BAO_Setting::getItem(CRM_Core_BAO_Setting::SYSTEM_PREFERENCES_NAME, 'enableSSL') &&
+    if (Civi::settings()->get('enableSSL') &&
       !CRM_Utils_System::isSSL() &&
       strtolower(CRM_Utils_Array::value('X_FORWARDED_PROTO', CRM_Utils_System::getRequestHeaders())) != 'https'
     ) {