Merge branch 'release/2.2.1'

getgrav · Jan 24, 2017 · 2e3919b · 2e3919b
2 parents 71db368 + 3e3d842
commit 2e3919b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# v2.2.1
+## 01/24/2017
+
+1. [](#bugfix)
+ * Fix login form/status templates displaying user as logged in even if he's not authenticated
+ * Use email validation instead of text validation in the forgot password form [https://github.com/gantry/gantry5/issues/1813](https://github.com/gantry/gantry5/issues/1813)
+
 # v2.2.0
 ## 12/13/2016
 
@@ -11,7 +18,7 @@
  * Added support for hiding `Remember me` checkbox and and `Forgot` button (for Offline functionality)
 1. [](#bugfix)
  * Fixed redirect issue in admin plugin
- 
+
 # v2.2.0-rc.4
 ## 12/04/2016
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Login
-version: 2.2.0
+version: 2.2.1
 description: Enables user authentication and login screen.
 icon: sign-in
 author:

diff --git a/pages/forgot.md b/pages/forgot.md
@@ -7,7 +7,7 @@ form:
 
  fields:
  - name: email
- type: text
+ type: email
  label: PLUGIN_LOGIN.EMAIL
  autofocus: true
  validate:

diff --git a/templates/partials/login-form.html.twig b/templates/partials/login-form.html.twig
@@ -3,7 +3,7 @@
 
  {% if page.template == 'login' or show_login_form %}
 
- {% if grav.user.username %}
+ {% if grav.user.authenticated %}
  <h4>{{ 'PLUGIN_LOGIN.WELCOME'|t }} <strong>{{ grav.user.fullname ?: grav.user.username }}</strong></h4>
  <hr>
  <a class="button logout" href="{{ uri.addNonce(base_url_relative ~ uri.path ~ '/task' ~ config.system.param_sep ~ 'login.logout', 'logout-form', 'logout-nonce') }}">{{ 'PLUGIN_LOGIN.BTN_LOGOUT'|t }}</a>

diff --git a/templates/partials/login-status.html.twig b/templates/partials/login-status.html.twig
@@ -1,5 +1,5 @@
 <span class="login-status">
- {% if grav.user.username %}
+ {% if grav.user.authenticated %}
  {{ 'PLUGIN_LOGIN.WELCOME'|t }} <strong>{{ grav.user.fullname ?: grav.user.username }}</strong>, <a class="logout" href="{{ uri.addNonce((base_url_relative ~ uri.path)|trim('/') ~ '/task' ~ config.system.param_sep ~ 'login.logout', 'logout-form', 'logout-nonce') }}">{{ 'PLUGIN_LOGIN.BTN_LOGOUT'|t }}</a>
  {% endif %}
 </span>