CRM-13740: enforce https when necessary, on ->extensionsURL.

diff --git a/CRM/Utils/System.php b/CRM/Utils/System.php
index 4a1eb20c937934252acdb4f5c1aa523d2be7a846..3883d6a744f89acb3da02fb23987d70564508924 100644 (file)
--- 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();
   }