4 files changed, 7 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index 88cc827d..03071a47 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/index.php b/index.php
index 835fd7d2..eb73941d 100644
--- a/index.php
+++ b/index.php
@@ -1245,10 +1245,12 @@ function renderPage($conf, $pluginManager, $LINKSDB)
            // Edit
            $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
            $updated = new DateTime();
+            $shortUrl = $LINKSDB[$id]['shorturl'];
        } else {
            // New link
            $created = DateTime::createFromFormat(LinkDB::LINK_DATE_FORMAT, $linkdate);
            $updated = null;
+            $shortUrl = link_small_hash($created, $id);
        }
        // Remove multiple spaces.
@@ -1275,7 +1277,7 @@ function renderPage($conf, $pluginManager, $LINKSDB)
            'created' => $created,
            'updated' => $updated,
            'tags' => str_replace(',', ' ', $tags),
-            'shorturl' => link_small_hash($created, $id),
+            'shorturl' => $shortUrl,
        );
        // If title is empty, use the URL as title.
diff --git a/plugins/markdown/markdown.meta b/plugins/markdown/markdown.meta
index 8df2ed0b..322856ea 100644
--- a/plugins/markdown/markdown.meta
+++ b/plugins/markdown/markdown.meta
@@ -1,4 +1,4 @@
 description="Render shaare description with Markdown syntax.<br><strong>Warning</strong>:
-If your shaared descriptions containing HTML tags before enabling the markdown plugin,
+If your shaared descriptions contained HTML tags before enabling the markdown plugin,
 enabling it might break your page.
 See the <a href=\"https://github.com/shaarli/Shaarli/tree/master/plugins/markdown#html-rendering\">README</a>."
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 @@
 <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">