From d51f0a0c92f1e929a768020cfa743a2b14c1e3c6 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 9 Jul 2019 19:06:07 +0300
Subject: [PATCH 1/5] Fixed bad redirect after login on multi-language site
 [#217]

---
 CHANGELOG.md           | 6 ++++++
 classes/Controller.php | 4 +++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaa6dff..be5ef5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 3.0.4
+## dd/mm/2019
+
+1. [](#bugfix)
+    * Fixed bad redirect after login on multi-language site [#217](https://github.com/getgrav/grav-plugin-login/issues/217)
+
 # 3.0.3
 ## 07/01/2019
 
diff --git a/classes/Controller.php b/classes/Controller.php
index fd9fd78..ef98e0b 100644
--- a/classes/Controller.php
+++ b/classes/Controller.php
@@ -167,7 +167,9 @@ public function taskLogin()
                 $event->defMessage('PLUGIN_LOGIN.LOGIN_SUCCESSFUL', 'info');
 
                 $event->defRedirect(
-                    $this->grav['session']->redirect_after_login ?: $this->grav['uri']->referrer('/')
+                    $this->grav['session']->redirect_after_login ?:
+                        $this->grav['config']->get('plugins.login.redirect_after_login') ?:
+                            $this->grav['uri']->referrer('/')
                 );
             } else {
                 $login_route = $this->grav['config']->get('plugins.login.route');

From 1e3a39a02574eea71366675c37275fb333d04116 Mon Sep 17 00:00:00 2001
From: Matias Griese <matias@trilbymedia.com>
Date: Tue, 9 Jul 2019 19:07:38 +0300
Subject: [PATCH 2/5] Changelog update

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index be5ef5f..3d0350f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 
 1. [](#bugfix)
     * Fixed bad redirect after login on multi-language site [#217](https://github.com/getgrav/grav-plugin-login/issues/217)
+    * Fixed basic login not obeying `redirect_after_login` option
 
 # 3.0.3
 ## 07/01/2019

From 1376eef5085a8cf8cb728809b446363af1dda1e1 Mon Sep 17 00:00:00 2001
From: Bennycopter <50641358+Bennycopter@users.noreply.github.com>
Date: Wed, 18 Sep 2019 14:56:02 -0400
Subject: [PATCH 3/5] Update login.yaml (#225)

Added missing option `user_registration.redirect_after_activation`.  The option is referenced in login.php on line 374, and it seems to be fully functional... it's just missing from the config file.
---
 login.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/login.yaml b/login.yaml
index 2a97989..c3d6d42 100644
--- a/login.yaml
+++ b/login.yaml
@@ -47,6 +47,7 @@ user_registration:
       login: 'true'
 
   redirect_after_registration: ''           # Route to redirect to after registration
+  redirect_after_activation: ''             # Route to redirect to after activation
 
   options:
     validate_password1_and_password2: true  # Ensure that password1 and password2 match during registration (allows you to have just 1 pw field or 2)

From 6b50a3e0df89b5bfc2c0785c3864696f3f783d66 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 3 Oct 2019 13:00:07 -0600
Subject: [PATCH 4/5] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d0350f..431632e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@
 1. [](#bugfix)
     * Fixed bad redirect after login on multi-language site [#217](https://github.com/getgrav/grav-plugin-login/issues/217)
     * Fixed basic login not obeying `redirect_after_login` option
+    * Provide default `redirect_after_activation` option [#225](https://github.com/getgrav/grav-plugin-login/issues/225)
 
 # 3.0.3
 ## 07/01/2019

From 0638bf6f7e9c4393dfc8ea1ecfe100c42da4db49 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 3 Oct 2019 13:00:49 -0600
Subject: [PATCH 5/5] prepare for release

---
 CHANGELOG.md    | 2 +-
 blueprints.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 431632e..41e5481 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
 # 3.0.4
-## dd/mm/2019
+## 10/03/2019
 
 1. [](#bugfix)
     * Fixed bad redirect after login on multi-language site [#217](https://github.com/getgrav/grav-plugin-login/issues/217)
diff --git a/blueprints.yaml b/blueprints.yaml
index 557135f..cd61758 100644
--- a/blueprints.yaml
+++ b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Login
-version: 3.0.3
+version: 3.0.4
 testing: false
 description: Enables user authentication and login screen.
 icon: sign-in