// 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.
'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.
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>."
<html>
<head>{include="includes"}</head>
<body
-{if="ban_canLogin()"}
+{if="ban_canLogin($conf)"}
{if="empty($username)"}
onload="document.loginform.login.focus();"
{else}
{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">
projects / github / shaarli / Shaarli.git / commitdiff
