Merge pull request #714 from ArthurHoaro/hotfix/banlogin

Fixes can login function call in loginform.html
2016-12-16 12:23:47 +01:00 · 2016-12-16 12:23:47 +01:00 · e3ffc8fdee
parent c0d96ce590 4cfe8d3303
commit e3ffc8fdee
2 changed files with 3 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -4,6 +4,7 @@ cache:
  directories:
    - $HOME/.composer/cache
 php:
+  - 7.1
  - 7.0
  - 5.6
  - 5.5
--- a/tpl/loginform.html
+++ b/tpl/loginform.html
@ -2,7 +2,7 @@
 <html>
 <head>{include="includes"}</head>
 <body
-{if="ban_canLogin()"}
+{if="ban_canLogin($conf)"}
  {if="empty($username)"}
    onload="document.loginform.login.focus();"
  {else}
@ -13,7 +13,7 @@
  {include="page.header"}

  <div id="headerform">
-    {if="!ban_canLogin()"}
+    {if="!ban_canLogin($conf)"}
      You have been banned from login after too many failed attempts. Try later.
    {else}
      <form method="post" name="loginform">