Merge branch 'master' into develop

This commit is contained in:
Flavio Copes 2016-07-19 12:05:21 +02:00
commit 6a846da4e3
2 changed files with 7 additions and 1 deletions

View File

@ -1,3 +1,9 @@
# v1.2.1
## 07/xx/2016
1. [](#bugfix)
* Check if Login plugin is installed before checking for user object [#28](https://github.com/getgrav/grav-plugin-comments/issues/28)
# v1.2.0
## 07/14/2016

View File

@ -11,7 +11,7 @@
{% if field.evaluateDefault %}
{% set value = evaluate(field.evaluateDefault) %}
{% endif %}
{% if grav.user.authenticated %}
{% if config.plugins.login.enabled and grav.user.authenticated %}
{% if field.name == 'name' %}
<input type="hidden" name="{{field.name}}" value="{{grav.user.fullname}}">
{% elseif field.name == 'email' %}