From 1ab84426303ef339cfbd81c08d9cfade332c64e6 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 18 Aug 2019 09:50:56 -0600
Subject: [PATCH] add fix

---
 CHANGELOG.md      | 10 ++++++++--
 system/router.php |  4 +---
 2 files changed, 9 insertions(+), 5 deletions(-)

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/router.php b/system/router.php
index 43571b354..1f16933e2 100644
--- a/system/router.php
+++ b/system/router.php
@@ -20,9 +20,7 @@ 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 */
-$grav_basedir = getenv('GRAV_BASEDIR') ?: '';
-
-if (isset($grav_basedir)) {
+if ($grav_basedir = getenv('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);