diff --git a/CHANGELOG.md b/CHANGELOG.md index d98b20c3c..7855812db 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -74,14 +74,20 @@ * Optimization: Initialize debugbar only after the configuration has been loaded * Optimization: Combine some early Grav processors into a single one +# v1.6.14 +## 08/18/2019 + +1. [](#bugfix) + * Actually include fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627) + # v1.6.13 -## 08/12/2019 +## 08/16/2019 1. [](#bugfix) * Regression fix for `system\router.php` [#2627](https://github.com/getgrav/grav/issues/2627) # v1.6.12 -## 08/11/2019 +## 08/14/2019 1. [](#new) * Added support for custom `FormFlash` save locations diff --git a/system/router.php b/system/router.php index 1f16933e2..b7eeeb5b7 100644 --- a/system/router.php +++ b/system/router.php @@ -20,7 +20,9 @@ if (is_file($_SERVER['DOCUMENT_ROOT'] . DIRECTORY_SEPARATOR . $_SERVER['SCRIPT_N $grav_index = 'index.php'; /* Check the GRAV_BASEDIR environment variable and use if set */ -if ($grav_basedir = getenv('GRAV_BASEDIR') ?: '') { + +$grav_basedir = getenv('GRAV_BASEDIR') ?: ''; +if ($grav_basedir) { $grav_index = ltrim($grav_basedir, '/') . DIRECTORY_SEPARATOR . $grav_index; $grav_basedir = DIRECTORY_SEPARATOR . trim($grav_basedir, DIRECTORY_SEPARATOR); define('GRAV_ROOT', str_replace(DIRECTORY_SEPARATOR, '/', getcwd()) . $grav_basedir);