From ce91c3820e090da11b9ca79157a437929cc78816 Mon Sep 17 00:00:00 2001 From: UndefinedOffset Date: Mon, 26 Sep 2016 09:46:00 -0300 Subject: [PATCH] BUGIX: Fix regression causing the admin to crash on windows due to FRAMEWORK_DIR being prefixed by a backslash --- Core/Constants.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/Constants.php b/Core/Constants.php index 563ec6f03..1f06f28dc 100644 --- a/Core/Constants.php +++ b/Core/Constants.php @@ -223,7 +223,7 @@ define('THEMES_PATH', BASE_PATH . '/' . THEMES_DIR); define('FRAMEWORK_PATH', realpath(__DIR__ . '/../')); if(strpos(FRAMEWORK_PATH, BASE_PATH) === 0) { - define('FRAMEWORK_DIR', trim(substr(FRAMEWORK_PATH, strlen(BASE_PATH)), '/')); + define('FRAMEWORK_DIR', trim(substr(FRAMEWORK_PATH, strlen(BASE_PATH)), DIRECTORY_SEPARATOR)); $frameworkDirSlashSuffix = FRAMEWORK_DIR ? FRAMEWORK_DIR . '/' : ''; } else { throw new Exception("Path error: FRAMEWORK_PATH " . FRAMEWORK_PATH . " not within BASE_PATH " . BASE_PATH);