From 42971713e6be4fc3001a269f9579d2aab1382677 Mon Sep 17 00:00:00 2001 From: Rich Lott / Artful Robot Date: Fri, 10 Feb 2023 14:08:38 +0000 Subject: [PATCH] standalone: work on cmsBaseUrl --- setup/plugins/init/Standalone.civi-setup.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/setup/plugins/init/Standalone.civi-setup.php b/setup/plugins/init/Standalone.civi-setup.php index 1273b953b9..4d5c5ee625 100644 --- a/setup/plugins/init/Standalone.civi-setup.php +++ b/setup/plugins/init/Standalone.civi-setup.php @@ -54,10 +54,13 @@ if (!defined('CIVI_SETUP')) { // ]; // Compute URLs (@todo?) - // $model->cmsBaseUrl = $_SERVER['HTTP_ORIGIN'] ?: $_SERVER['HTTP_REFERER']; - $model->cmsBaseUrl = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST']; + // original: $model->cmsBaseUrl = $_SERVER['HTTP_ORIGIN'] ?: $_SERVER['HTTP_REFERER']; + if (empty($model->cmsBaseUrl)) { + // A buildkit install (which uses cv core:install) sets this correctly. But a standard composer-then-website type install does not. + $model->cmsBaseUrl = $_SERVER['REQUEST_SCHEME'] . '://' . $_SERVER['HTTP_HOST']; + } - // These mandatorySettings become 'extra settings from installer' and set values in + // These mandatorySettings become 'Additional settings from installer' (via 'extraSettings') and set values in // $civicrm_setting['domain'][k] = v; $model->mandatorySettings['userFrameworkResourceURL'] = $model->cmsBaseUrl . '/assets/civicrm/core'; -- 2.25.1