Merge pull request #1107 from virtualtam/apache/htaccess/jwt-header

httpd: always forward the 'Authorization' header

diff --git a/doc/md/Upgrade-and-migration.md b/doc/md/Upgrade-and-migration.md
index f666be751034c9b6d6e2f842c89435892b92e7dc..ac24ff34053c64e818ead7df366bb2b9968e75ac 100644 (file)
--- a/doc/md/Upgrade-and-migration.md
+++ b/doc/md/Upgrade-and-migration.md
@@ -3,7 +3,7 @@
 ### Note your current version
 
 If anything goes wrong, it's important for us to know which version you're upgrading from.
-The current version is present in the `version.php` file.
+The current version is present in the `shaarli_version.php` file.
 
 ### Backup your data
 

diff --git a/tpl/vintage/loginform.html b/tpl/vintage/loginform.html
index 2c9b710e8cc344af87f94aa6d5bce55b0ba37523..0f7d6387e8ec07e2dfc93b16afc23dfdc203c7c0 100644 (file)
--- a/tpl/vintage/loginform.html
+++ b/tpl/vintage/loginform.html
@@ -13,7 +13,7 @@
   {include="page.header"}
 
   <div id="headerform">
-    {if="!ban_canLogin($conf)"}
+    {if="!$user_can_login"}
       You have been banned from login after too many failed attempts. Try later.
     {else}
       <form method="post" name="loginform">