From: Arthur Date: Fri, 16 Dec 2016 11:23:47 +0000 (+0100) Subject: Merge pull request #714 from ArthurHoaro/hotfix/banlogin X-Git-Tag: v0.9.0~88 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e3ffc8fdee30be41046b985fe6e7034fb580b0c8;hp=c0d96ce59005e83cd210065620aa6f3bb96e4f81;p=github%2Fshaarli%2FShaarli.git Merge pull request #714 from ArthurHoaro/hotfix/banlogin Fixes can login function call in loginform.html --- diff --git a/.travis.yml b/.travis.yml index 9ffb3d00..6ff1b20f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,6 +4,7 @@ cache: directories: - $HOME/.composer/cache php: + - 7.1 - 7.0 - 5.6 - 5.5 diff --git a/tpl/loginform.html b/tpl/loginform.html index a49b42d3..84176385 100644 --- a/tpl/loginform.html +++ b/tpl/loginform.html @@ -2,7 +2,7 @@ {include="includes"} - {if="!ban_canLogin()"} + {if="!ban_canLogin($conf)"} You have been banned from login after too many failed attempts. Try later. {else}