From 1136a1007e52c63bdcaf65ed427eb31072618674 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Wed, 26 May 2021 10:48:50 +0300
Subject: [PATCH] Fixed configuration not fully updating on save [#2149]

---
 CHANGELOG.md                       | 3 ++-
 classes/plugin/AdminController.php | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2890cbb7..85d5e2f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fixed issue with some elements overflowing closed list items [#2146](https://github.com/getgrav/grav-plugin-admin/issues/2146)
+    * Fixed configuration not fully updating on save [#2149](https://github.com/getgrav/grav-plugin-admin/issues/2149)
 
 
 # v1.10.15
@@ -14,7 +15,7 @@
     * Updated node modules dev dependencies
     * Package.json scripts cleanup
     * Recompiled JS for production
-    * Use `base645_encode` filter rather than function  
+    * Use `base645_encode` filter rather than function
     * Editor: Do not assume images URLs are going to be `http://` (wrong assumption plus not SSL) [#2127](https://github.com/getgrav/grav-plugin-admin/issues/2127)
     * Improved Theme Activation + Plugin Enabled logic to ensure configuration is not displayed unless activation/enabled state. Fixes [#2140](https://github.com/getgrav/grav-plugin-admin/issues/2140)
 1. [](#bugfix)
diff --git a/classes/plugin/AdminController.php b/classes/plugin/AdminController.php
index f14097a9..abae8c7e 100644
--- a/classes/plugin/AdminController.php
+++ b/classes/plugin/AdminController.php
@@ -201,12 +201,16 @@ class AdminController extends AdminBaseController
             $this->grav->fireEvent('onAdminAfterSave', new Event(['object' => $obj]));
         }
 
+        Cache::clearCache('invalidate');
+
         // Force configuration reload.
         /** @var Config $config */
         $config = $this->grav['config'];
         $config->reload();
 
-        Cache::clearCache('invalidate');
+        if ($this->view === 'config') {
+            $this->setRedirect($this->admin->getAdminRoute("/{$this->view}/{$this->route}")->toString());
+        }
 
         return true;
     }