From 53e972a850854c68f64b67f47598581f68d1e113 Mon Sep 17 00:00:00 2001 From: Stephen Palmstrom Date: Fri, 22 Nov 2019 15:42:10 +0000 Subject: [PATCH] dev/core#1384 Joomla: fix JPATH_BASE when using a virtual directory on Windows (#15915) --- CRM/Utils/System/Joomla.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php index 29502c5a29..84437d481f 100644 --- a/CRM/Utils/System/Joomla.php +++ b/CRM/Utils/System/Joomla.php @@ -548,10 +548,11 @@ class CRM_Utils_System_Joomla extends CRM_Utils_System_Base { // load BootStrap here if needed // We are a valid Joomla entry point. + // dev/core#1384 Use DS to ensure a correct JPATH_BASE in Windows if (!defined('_JEXEC') && $loadDefines) { define('_JEXEC', 1); define('DS', DIRECTORY_SEPARATOR); - define('JPATH_BASE', $joomlaBase . '/administrator'); + define('JPATH_BASE', $joomlaBase . DS . 'administrator'); require $joomlaBase . '/administrator/includes/defines.php'; } -- 2.25.1