diff --git a/CHANGELOG.md b/CHANGELOG.md index 704a3fa24..b351e5ad0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,17 @@ +# 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/defines.php b/system/defines.php index e45b28134..5804a53e3 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.6.13'); +define('GRAV_VERSION', '1.6.14'); define('GRAV_TESTING', false); define('DS', '/'); diff --git a/system/router.php b/system/router.php index 43571b354..5e3c47791 100644 --- a/system/router.php +++ b/system/router.php @@ -21,8 +21,7 @@ $grav_index = 'index.php'; /* Check the GRAV_BASEDIR environment variable and use if set */ $grav_basedir = getenv('GRAV_BASEDIR') ?: ''; - -if (isset($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);