dev/core#1384 Joomla: fix JPATH_BASE when using a virtual directory on Windows (...

diff --git a/CRM/Utils/System/Joomla.php b/CRM/Utils/System/Joomla.php
index 29502c5a29a2d3d24f66dfa7781782eaa4b8302b..84437d481f805ced97c7694ddd7b2f0696602ee3 100644 (file)
--- 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';
     }