From 7113f5062bebc971f7600418cf2e6da3d63d8571 Mon Sep 17 00:00:00 2001 From: Mathieu Lutfy Date: Mon, 11 Nov 2013 10:00:27 -0500 Subject: [PATCH] CRM-13740: enforce https when necessary, on ->extensionsURL. --- CRM/Utils/System.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php index 4a1eb20c93..3883d6a744 100644 --- a/CRM/Utils/System.php +++ b/CRM/Utils/System.php @@ -469,10 +469,13 @@ class CRM_Utils_System { */ static function mapConfigToSSL() { $config = CRM_Core_Config::singleton(); - $config->userFrameworkResourceURL = str_replace('http://', 'https://', - $config->userFrameworkResourceURL - ); + $config->userFrameworkResourceURL = str_replace('http://', 'https://', $config->userFrameworkResourceURL); $config->resourceBase = $config->userFrameworkResourceURL; + + if (! empty($config->extensionsURL)) { + $config->extensionsURL = str_replace('http://', 'https://', $config->extensionsURL); + } + return $config->userSystem->mapConfigToSSL(); } -- 2.25.1