diff --git a/CHANGELOG.md b/CHANGELOG.md index bed094741..3d57ed7f8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ * Fixed nxinx appending repeating `?_url=` in some redirects * Fixed deleting page with language code not removing the folder if it was the last language [#3305](https://github.com/getgrav/grav/issues/3305) * Fixed fatal error when using markdown links with `image://` stream [#3285](https://github.com/getgrav/grav/issues/3285) + * Fixed `system.languages.session_store_active` not having any effect [#3269](https://github.com/getgrav/grav/issues/3269) # v1.7.10 ## 04/06/2021 diff --git a/system/src/Grav/Common/Processors/InitializeProcessor.php b/system/src/Grav/Common/Processors/InitializeProcessor.php index 0f8567fcf..cc8e4f260 100644 --- a/system/src/Grav/Common/Processors/InitializeProcessor.php +++ b/system/src/Grav/Common/Processors/InitializeProcessor.php @@ -101,7 +101,14 @@ class InitializeProcessor extends ProcessorBase // Load pages. $this->initializePages($config); - // Initialize URI. + // Load accounts (decides class to be used). + // TODO: remove in 2.0. + $this->container['accounts']; + + // Initialize session. + $this->initializeSession($config); + + // Initialize URI (uses session, see issue #3269). $this->initializeUri($config); // Grav may return redirect response right away. @@ -115,13 +122,6 @@ class InitializeProcessor extends ProcessorBase } } - // Load accounts (decides class to be used). - // TODO: remove in 2.0. - $this->container['accounts']; - - // Initialize session. - $this->initializeSession($config); - $this->stopTimer('_init'); // Wrap call to next handler so that debugger can profile it.